diff --git a/packages/network/connman/config/settings b/packages/network/connman/config/settings
new file mode 100644
index 0000000000..0ae93384dc
--- /dev/null
+++ b/packages/network/connman/config/settings
@@ -0,0 +1,18 @@
+[global]
+OfflineMode=false
+Timeservers=0.pool.ntp.org;1.pool.ntp.org;2.pool.ntp.org;3.pool.ntp.org
+
+[Wired]
+Enable=true
+
+[WiFi]
+Enable=true
+
+[Bluetooth]
+Enable=false
+
+[3G]
+Enable=false
+
+[WiMAX]
+Enable=false
diff --git a/packages/network/connman/package.mk b/packages/network/connman/package.mk
index 0dfb382bf3..121fcf3681 100644
--- a/packages/network/connman/package.mk
+++ b/packages/network/connman/package.mk
@@ -88,7 +88,6 @@ post_makeinstall_target() {
     sed -i $INSTALL/etc/connman/main.conf \
         -e "s|^# BackgroundScanning.*|BackgroundScanning = true|g" \
         -e "s|^# FallbackNameservers.*|FallbackNameservers = 8.8.8.8,8.8.4.4|g" \
-        -e "s|^# FallbackTimeservers.*|FallbackTimeservers = 0.pool.ntp.org,1.pool.ntp.org,2.pool.ntp.org,3.pool.ntp.org|g" \
         -e "s|^# PreferredTechnologies.*|PreferredTechnologies = ethernet,wifi,cellular|g" \
         -e "s|^# TetheringTechnologies.*|TetheringTechnologies = wifi|g" \
         -e "s|^# AllowHostnameUpdates.*|AllowHostnameUpdates = false|g" \
@@ -96,6 +95,9 @@ post_makeinstall_target() {
 
   mkdir -p $INSTALL/usr/config
     cp $PKG_DIR/config/hosts.conf $INSTALL/usr/config
+
+  mkdir -p $INSTALL/usr/share/connman/
+    cp $PKG_DIR/config/settings $INSTALL/usr/share/connman/
 }
 
 post_install() {
diff --git a/packages/network/connman/scripts/connman-setup b/packages/network/connman/scripts/connman-setup
index a0c985e122..060d0b6cce 100755
--- a/packages/network/connman/scripts/connman-setup
+++ b/packages/network/connman/scripts/connman-setup
@@ -17,6 +17,12 @@
 #  along with OpenELEC.  If not, see <http://www.gnu.org/licenses/>.
 ################################################################################
 
+# creating initial settings file
+  if [ ! -f /storage/.cache/connman/settings ]; then
+    mkdir -p /storage/.cache/connman
+      cp /usr/share/connman/settings /storage/.cache/connman
+  fi
+
 # set variable for connman main.conf location
   if [ -f /storage/.config/connman_main.conf ]; then
     export CONNMAN_MAIN="--config=/storage/.config/connman_main.conf"