diff --git a/packages/network/connman/config/hosts.conf b/packages/network/connman/config/hosts.conf
new file mode 100644
index 0000000000..ca58cffac8
--- /dev/null
+++ b/packages/network/connman/config/hosts.conf
@@ -0,0 +1,4 @@
+# Here you can add additional hosts for usage with hosts.conf from system
+#
+# Format:  <ipaddress> <hostname1> <hostname2>
+# Example: 192.168.0.3 mynas mynas.mynetwork storage
diff --git a/packages/network/connman/init.d/10_network b/packages/network/connman/init.d/10_network
index 2087fc11cf..6b10e61a06 100755
--- a/packages/network/connman/init.d/10_network
+++ b/packages/network/connman/init.d/10_network
@@ -42,6 +42,9 @@
   progress "creating /etc/hosts"
   echo -e "127.0.0.1\tlocalhost $HOSTNAME" > /etc/hosts
 
+# add user defined hosts.conf entry's
+  [ -f $HOME/.config/hosts.conf ] && cat $HOME/.config/hosts.conf >> /etc/hosts
+
 (
   # setup Networking
     progress "setup Networking"
diff --git a/packages/network/connman/install b/packages/network/connman/install
index 1db5c34ca7..e1d0db2b8b 100755
--- a/packages/network/connman/install
+++ b/packages/network/connman/install
@@ -16,6 +16,7 @@ mkdir -p $INSTALL/usr/sbin
 
 mkdir -p $INSTALL/usr/config
   cp $PKG_DIR/config/network.conf $INSTALL/usr/config
+  cp $PKG_DIR/config/hosts.conf $INSTALL/usr/config
 
 if [ "$DEVTOOLS" = yes ]; then
   mkdir -p $INSTALL/usr/bin