diff --git a/meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init-2.0/xserver-nodm.service b/meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init-2.0/xserver-nodm.service
new file mode 100644
index 0000000000..b781c7d3c9
--- /dev/null
+++ b/meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init-2.0/xserver-nodm.service
@@ -0,0 +1,8 @@
+[Unit]
+Description=Xserver startup with a display manager
+
+[Service]
+ExecStart=/usr/bin/xinit /etc/X11/Xsession -- /usr/bin/Xorg
+
+[Install]
+WantedBy=multi-user.target
diff --git a/meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init_2.0.bb b/meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init_2.0.bb
index de378e6066..d4a6b972fd 100644
--- a/meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init_2.0.bb
+++ b/meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init_2.0.bb
@@ -2,11 +2,11 @@ DESCRIPTION = "Simple Xserver Init Script (no dm)"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
 SECTION = "x11"
-RDEPENDS_${PN} = "xserver-common (>= 1.30) xinit"
-DEFAULT_PREFERENCE = "-1"
-PR = "r5"
+
+PR = "r9"
 
 SRC_URI = "file://xserver-nodm \
+           file://xserver-nodm.service \
            file://gplv2-license.patch \
 "
 S = ${WORKDIR}
@@ -14,13 +14,29 @@ S = ${WORKDIR}
 inherit allarch
 
 do_install() {
-    install -d ${D}/etc
-    install -d ${D}/etc/init.d
-    install xserver-nodm ${D}/etc/init.d
+	install -d ${D}${sysconfdir}/init.d
+	install xserver-nodm ${D}${sysconfdir}/init.d
+
+	install -d ${D}${base_libdir}/systemd/system
+	install -m 0644 xserver-nodm.service ${D}${base_libdir}/systemd/system/
 }
 
+RDEPENDS_${PN} = "xserver-common (>= 1.30) xinit"
+FILES_${PN} += "${base_libdir}/systemd/system/"
+
 inherit update-rc.d
 
 INITSCRIPT_NAME = "xserver-nodm"
 INITSCRIPT_PARAMS = "start 01 5 2 . stop 01 0 1 6 ."
 INITSCRIPT_PARAMS_shr = "start 90 5 2 . stop 90 0 1 6 ."
+
+pkg_postinst_${PN}_append () {
+    # can't do this offline
+    if [ "x$D" != "x" ]; then
+        exit 1
+    fi
+
+    if [ -e /bin/systemctl ] ; then
+        systemctl enable xserver-nodm.service
+    fi
+}