diff --git a/conf/distro/angstrom-next.conf b/conf/distro/angstrom-next.conf
index 61f87fb..9365094 100644
--- a/conf/distro/angstrom-next.conf
+++ b/conf/distro/angstrom-next.conf
@@ -118,6 +118,8 @@ PNBLACKLIST[gconf-dbus]        = "gconf-dbus has been merged back into main GCon
 PNBLACKLIST[gconf-dbus-native] = "gconf-dbus has been merged back into main GConf"
 PNBLACKLIST[ffmpeg] = "libav is preferred over ffmpeg"
 
+# Define splash before it gets set to empty in angstrom-core-tweaks.inc:
+SPLASH ?= ' ${@base_contains("MACHINE_FEATURES", "screen", "dietsplash", "",d)}'
 require conf/distro/include/angstrom.inc
 
 # Prefer openssh over dropbear
@@ -182,7 +184,6 @@ DISTRO_EXTRA_RRECOMMENDS += " \
     ${DEBUG_APPS} \
 "
 
-SPLASH ?= ' ${@base_contains("MACHINE_FEATURES", "screen", "psplash-angstrom", "",d)}'
 
 DISTRO_FEATURES += "${LDISGOLD}"
 #LDISGOLD_arm = "ld-is-gold"
diff --git a/recipes-core/psplash/files/psplash-init b/recipes-core/psplash/files/psplash-init
index 0409240..7d50374 100644
--- a/recipes-core/psplash/files/psplash-init
+++ b/recipes-core/psplash/files/psplash-init
@@ -1,11 +1,18 @@
 #!/bin/sh 
+### BEGIN INIT INFO
+# Provides:             psplash
+# Required-Start:
+# Required-Stop:
+# Default-Start:        S
+# Default-Stop:
+### END INIT INF
 
 if grep -qE '\s?psplash=false\s?' /proc/cmdline; then
 	echo "Boot splashscreen disabled"
 	exit 0;
 fi
 
-. /etc/init.d/functions
+. /etc/default/splashfuncs
 . /etc/default/psplash
 
 case `machine_id` in
diff --git a/recipes-core/psplash/files/splashfuncs b/recipes-core/psplash/files/splashfuncs
index ada2a96..028bfdc 100644
--- a/recipes-core/psplash/files/splashfuncs
+++ b/recipes-core/psplash/files/splashfuncs
@@ -1,3 +1,6 @@
+machine_id() { # return the machine ID
+  awk 'BEGIN { FS=": " } /Hardware/ { gsub(" ", "_", $2); print tolower($2) } ' </proc/cpuinfo
+}
 status() {
   if type splash-write >/dev/null 2>&1; then
     (TMPDIR="/mnt/.splash" EXQUISITE_IPC="$TMPDIR/exquisite" splash-write "$1" || true) &
diff --git a/recipes-core/psplash/psplash-ua.inc b/recipes-core/psplash/psplash-ua.inc
index c1c3c8f..a88af09 100644
--- a/recipes-core/psplash/psplash-ua.inc
+++ b/recipes-core/psplash/psplash-ua.inc
@@ -4,6 +4,6 @@ do_install_append() {
 	mv ${D}${bindir}/psplash ${D}${bindir}/psplash.${PN}
 }
 
-ALTERNATIVE_NAME = "psplash"
-ALTERNATIVE_LINK = "${bindir}/psplash"
-ALTERNATIVE_PATH = "${bindir}/psplash.${PN}"
+ALTERNATIVE_${PN} = "psplash"
+ALTERNATIVE_LINK_NAME[psplash] = "${bindir}/psplash"
+ALTERNATIVE_TARGET[psplash] = "${bindir}/psplash.${PN}"
diff --git a/recipes-core/psplash/psplash.inc b/recipes-core/psplash/psplash.inc
index c8e905c..6d9fa58 100644
--- a/recipes-core/psplash/psplash.inc
+++ b/recipes-core/psplash/psplash.inc
@@ -44,9 +44,9 @@ do_install_prepend() {
 }
 
 INITSCRIPT_NAME = "psplash"
-INITSCRIPT_PARAMS = "start 01 S . stop 20 0 1 6 ."
+INITSCRIPT_PARAMS = "start 0 S . stop 20 0 1 6 ."
 
-PACKAGES =+ "psplash-support"
+PACKAGES =+ "${PN}-support"
 
-RDEPENDS_${PN} += "psplash-support"
-FILES_psplash-support += "/mnt/.splash ${sysconfdir} ${bindir}/psplash-write ${bindir}/splash-write"
+RDEPENDS_${PN} += "${PN}-support"
+FILES_${PN}-support += "/mnt/.splash ${sysconfdir} ${bindir}/psplash-write ${bindir}/splash-write"
diff --git a/recipes-images/angstrom/development-gnome-image.bb b/recipes-images/angstrom/development-gnome-image.bb
index a0658a7..9fa133b 100644
--- a/recipes-images/angstrom/development-gnome-image.bb
+++ b/recipes-images/angstrom/development-gnome-image.bb
@@ -4,6 +4,7 @@ CONMANPKGS = "connman connman-angstrom-settings connman-plugin-loopback connman-
 
 require systemd-image.bb
 
+EXTRA_IMAGE_FEATURES += "splash"
 ARCHTOOLS = ""
 ARCHTOOLS_x86 = "dmidecode"
 
diff --git a/recipes-images/angstrom/efl-nodm-image.bb b/recipes-images/angstrom/efl-nodm-image.bb
index c5e2668..7156933 100644
--- a/recipes-images/angstrom/efl-nodm-image.bb
+++ b/recipes-images/angstrom/efl-nodm-image.bb
@@ -2,6 +2,8 @@
 
 require systemd-image.bb
 
+EXTRA_IMAGE_FEATURES += "splash"
+
 XSERVER ?= "xserver-xorg \
             xf86-video-fbdev \
             xf86-input-evdev \
diff --git a/recipes-images/angstrom/systemd-gnome-image.bb b/recipes-images/angstrom/systemd-gnome-image.bb
index 148a61c..4ea431c 100644
--- a/recipes-images/angstrom/systemd-gnome-image.bb
+++ b/recipes-images/angstrom/systemd-gnome-image.bb
@@ -1,5 +1,7 @@
 require systemd-image.bb
 
+EXTRA_IMAGE_FEATURES += "splash"
+
 IMAGE_INSTALL += " \
 	xinput-calibrator \
 	systemd-analyze \
diff --git a/recipes-images/angstrom/xfce-nm-image.bb b/recipes-images/angstrom/xfce-nm-image.bb
index ea20f59..e48fdd2 100644
--- a/recipes-images/angstrom/xfce-nm-image.bb
+++ b/recipes-images/angstrom/xfce-nm-image.bb
@@ -2,6 +2,8 @@ require systemd-image.bb
 
 CONMANPKGS = "networkmanager network-manager-applet"
 
+EXTRA_IMAGE_FEATURES += "splash"
+
 IMAGE_INSTALL += " \
 	packagegroup-xfce-base \
 	packagegroup-gnome-xserver-base \