diff --git a/meta-oe/recipes-connectivity/connman/connman.inc b/meta-oe/recipes-connectivity/connman/connman.inc
index 0a6360c79f..7dd30fc211 100644
--- a/meta-oe/recipes-connectivity/connman/connman.inc
+++ b/meta-oe/recipes-connectivity/connman/connman.inc
@@ -72,8 +72,28 @@ FILES_${PN} = "${bindir}/* ${sbindir}/* ${libexecdir}/* ${libdir}/lib*.so.* \
             ${libdir}/bonobo/servers \
             ${datadir}/dbus-1/system-services/*"
 
+PACKAGES =+ "${PN}-systemd"
 # Package up systemd files
-FILES_${PN} += "${base_libdir}/systemd"
+FILES_${PN}-systemd += "${base_libdir}/systemd"
+
+pkg_postinst_connman-systemd() {
+	# can't do this offline
+	if [ "x$D" != "x" ]; then
+		exit 1
+	fi
+	
+	systemctl enable connman.service
+}
+
+pkg_postrm_connman-systemd() {
+	# can't do this offline
+	if [ "x$D" != "x" ]; then
+		exit 1
+	fi
+
+	systemctl disable connman.service
+}
+
 # Needed when using DNS proxy feature
 RRECOMMENDS_${PN} += "dnsmasq-dbus"
 
diff --git a/meta-oe/recipes-connectivity/connman/connman_0.73.bb b/meta-oe/recipes-connectivity/connman/connman_0.73.bb
index 6b52c7895b..43b9976022 100644
--- a/meta-oe/recipes-connectivity/connman/connman_0.73.bb
+++ b/meta-oe/recipes-connectivity/connman/connman_0.73.bb
@@ -1,5 +1,5 @@
 require connman.inc
-PR = "r2"
+PR = "r3"
 
 EXTRA_OECONF += "\
   --disable-gtk-doc \