diff --git a/packages/network/connman/package.mk b/packages/network/connman/package.mk
index 0057328b54..88fa636bd2 100644
--- a/packages/network/connman/package.mk
+++ b/packages/network/connman/package.mk
@@ -88,6 +88,8 @@ PKG_MAKE_OPTS_TARGET="storagedir=/storage/.cache/connman \
                       statedir=/run/connman"
 
 post_makeinstall_target() {
+  rm -rf $INSTALL/lib/systemd
+
   mkdir -p $INSTALL/usr/bin
     cp -P client/connmanctl $INSTALL/usr/bin
 
diff --git a/packages/network/connman/system.d/connman-vpn.service b/packages/network/connman/system.d/connman-vpn.service
new file mode 100644
index 0000000000..20c969d663
--- /dev/null
+++ b/packages/network/connman/system.d/connman-vpn.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=ConnMan VPN service
+Before=network.target
+Wants=network.target
+
+[Service]
+Type=dbus
+BusName=net.connman.vpn
+ExecStart=/usr/sbin/connman-vpnd -n
+StandardOutput=null
+
+[Install]
+WantedBy=multi-user.target
diff --git a/packages/network/connman/system.d/connman.service b/packages/network/connman/system.d/connman.service
new file mode 100644
index 0000000000..1f040438ed
--- /dev/null
+++ b/packages/network/connman/system.d/connman.service
@@ -0,0 +1,14 @@
+[Unit]
+Description=Connection service
+Before=network.target
+Wants=network.target
+
+[Service]
+Type=dbus
+BusName=net.connman
+Restart=on-failure
+ExecStart=/usr/sbin/connmand -n
+StandardOutput=null
+
+[Install]
+WantedBy=multi-user.target