diff --git a/recipes-core/easysplash/easysplash-common-2.0.inc b/recipes-core/easysplash/easysplash-common-2.0.inc
index 913cf31..3fad888 100644
--- a/recipes-core/easysplash/easysplash-common-2.0.inc
+++ b/recipes-core/easysplash/easysplash-common-2.0.inc
@@ -9,7 +9,6 @@ SRC_URI = "git://github.com/OSSystems/EasySplash.git;branch=${SRCBRANCH};protoco
 
 PV = "2.0.0"
 
-S = "${WORKDIR}/git"
 
 EXTRA_OEMAKE += " \
     prefix=${prefix} \
diff --git a/recipes-core/easysplash/easysplash-config_2.0.0.bb b/recipes-core/easysplash/easysplash-config_2.0.0.bb
index 8673f5e..15e6093 100644
--- a/recipes-core/easysplash/easysplash-config_2.0.0.bb
+++ b/recipes-core/easysplash/easysplash-config_2.0.0.bb
@@ -4,7 +4,7 @@ LICENSE = "CLOSED"
 SRC_URI += "file://easysplash.default"
 
 do_install() {
-    install -Dm 0644 ${WORKDIR}/easysplash.default ${D}${sysconfdir}/default/easysplash
+    install -Dm 0644 ${UNPACKDIR}/easysplash.default ${D}${sysconfdir}/default/easysplash
 }
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
diff --git a/recipes-core/easysplash/easysplash_2.0.0.bb b/recipes-core/easysplash/easysplash_2.0.0.bb
index 8b4ac48..8a623c0 100644
--- a/recipes-core/easysplash/easysplash_2.0.0.bb
+++ b/recipes-core/easysplash/easysplash_2.0.0.bb
@@ -35,12 +35,14 @@ PACKAGECONFIG ?= "\
     ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \
 "
 
-PACKAGECONFIG[sysvinit] = "INIT=1, INIT=0,"
-PACKAGECONFIG[systemd] = "SYSTEMD=1, SYSTEM=0, systemd"
+PACKAGECONFIG[sysvinit] = ",,"
+PACKAGECONFIG[systemd] = ",, systemd"
 
 do_install:append() {
-    (cd ${S} ; oe_runmake install-service DESTDIR=${D})
-    rm ${D}${sysconfdir}/default/easysplash
+    (cd ${S} ; oe_runmake install-service DESTDIR=${D} \
+          ${@bb.utils.contains('PACKAGECONFIG', 'sysvinit', 'INIT=1', 'INIT=0', d)} \
+          ${@bb.utils.contains('PACKAGECONFIG', 'systemd', 'SYSTEMD=1', 'SYSTEMD=0', d)})
+      rm ${D}${sysconfdir}/default/easysplash
 }
 
 RDEPENDS:${PN} += "easysplash-config"