diff --git a/packages/network/connman/package.mk b/packages/network/connman/package.mk
index 3f9858b8cd..fac094c721 100644
--- a/packages/network/connman/package.mk
+++ b/packages/network/connman/package.mk
@@ -116,6 +116,7 @@ post_install() {
 }
 
 post_install() {
+  enable_service hostname.service
   enable_service connman.service
   if [ "$PPTP_SUPPORT" = yes -o "$OPENVPN_SUPPORT" = yes ]; then
     enable_service connman-vpn.service
diff --git a/packages/network/connman/system.d/hostname.service b/packages/network/connman/system.d/hostname.service
new file mode 100644
index 0000000000..5ff445fdc0
--- /dev/null
+++ b/packages/network/connman/system.d/hostname.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=Setup Hostname
+DefaultDependencies=no
+ConditionPathExists=/storage/.cache/hostname
+After=local-fs.target
+
+[Service]
+Type=oneshot
+ExecStart=/bin/sh -c 'cat /storage/.cache/hostname > /proc/sys/kernel/hostname'
+RemainAfterExit=yes
+
+[Install]
+WantedBy=sysinit.target