diff --git a/packages/network/connman/scripts/connman-setup b/packages/network/connman/scripts/connman-setup
index c4c4734648..060d0b6cce 100755
--- a/packages/network/connman/scripts/connman-setup
+++ b/packages/network/connman/scripts/connman-setup
@@ -22,3 +22,10 @@
     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"
+  else
+    export CONNMAN_MAIN="--config=/etc/connman/main.conf"
+  fi
diff --git a/packages/network/connman/system.d/connman.service b/packages/network/connman/system.d/connman.service
index 368033e311..6b9c7e462f 100644
--- a/packages/network/connman/system.d/connman.service
+++ b/packages/network/connman/system.d/connman.service
@@ -11,8 +11,7 @@ Type=dbus
 BusName=net.connman
 Restart=on-failure
 EnvironmentFile=-/run/openelec/debug/connman.conf
-ExecStartPre=/usr/lib/connman/connman-setup
-ExecStart=/usr/sbin/connmand -nr $CONNMAN_DEBUG
+ExecStart=/bin/sh -c ". /usr/lib/connman/connman-setup; exec /usr/sbin/connmand -nr $CONNMAN_MAIN $CONNMAN_DEBUG"
 # send SIGKILL on stop to keep ip configuration
 KillSignal=SIGKILL
 StandardOutput=null