diff --git a/meta-arago-distro/recipes-graphics/wayland/weston-init.bbappend b/meta-arago-distro/recipes-graphics/wayland/weston-init.bbappend
index 28e7ae39..c294fba4 100644
--- a/meta-arago-distro/recipes-graphics/wayland/weston-init.bbappend
+++ b/meta-arago-distro/recipes-graphics/wayland/weston-init.bbappend
@@ -1,23 +1,33 @@
 FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
-PR:append = ".arago12"
+PR:append = ".arago13"
 
 SRC_URI:append = " \
     file://runWeston \
     file://wayland_env.sh \
     file://weston.ini \
+    file://weston-init.service \
 "
 
 do_install:append() {
     install -d ${D}${bindir}
     install -m 755 ${WORKDIR}/runWeston ${D}${bindir}
     rm -rf ${D}${systemd_system_unitdir}
-
+ 
     install -d ${D}${sysconfdir}/profile.d
     install -m 0644 ${WORKDIR}/weston.ini ${D}${sysconfdir}
     install -m 0644 ${WORKDIR}/wayland_env.sh ${D}${sysconfdir}/profile.d/
+    install -Dm755 ${WORKDIR}/init ${D}/${sysconfdir}/init.d/weston
+    sed -i 's#ROOTHOME#${ROOT_HOME}#' ${D}/${sysconfdir}/init.d/weston
+    
+    install -d ${D}${sysconfdir}/systemd/system
+    install -D -p -m0644 ${WORKDIR}/weston-init.service ${D}${sysconfdir}/systemd/system/weston.service
+    install -D -p -m0644 ${WORKDIR}/weston.socket ${D}${sysconfdir}/systemd/system
 }
 
-FILES:${PN}:remove = "${systemd_system_unitdir}/weston.service ${systemd_system_unitdir}/weston.socket"
-FILES:${PN} += "${sysconfdir}/profile.d/* ${sysconfdir}/weston.ini"
-SYSTEMD_SERVICE:${PN}:remove = "weston.service weston.socket"
+FILES:${PN} += "${sysconfdir}/profile.d/* ${sysconfdir}/weston.ini ${sysconfdir}/systemd/system/weston.service ${sysconfdir}/systemd/system/weston.socket"
+
+SYSTEMD_SERVICE:${PN} = "weston.service"
+
+INITSCRIPT_NAME = ""
+INITSCRIPT_PARAMS = ""
diff --git a/meta-arago-distro/recipes-graphics/wayland/weston-init/weston-init.service b/meta-arago-distro/recipes-graphics/wayland/weston-init/weston-init.service
new file mode 100644
index 00000000..d4c7d472
--- /dev/null
+++ b/meta-arago-distro/recipes-graphics/wayland/weston-init/weston-init.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=Systemd Service to Start Weston
+
+[Service]
+Type=forking
+ExecStart=/etc/init.d/weston start
+StandardOutput=journal
+
+[Install]
+WantedBy=multi-user.target