diff --git a/recipes-core/psplash/files/framebuf.conf b/recipes-core/psplash/files/framebuf.conf
deleted file mode 100644
index 44e1dedd6..000000000
--- a/recipes-core/psplash/files/framebuf.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-[Unit]
-Requires=sys-devices-platform-gpu-graphics-fb0.device
-After=sys-devices-platform-gpu-graphics-fb0.device
-
diff --git a/recipes-core/psplash/psplash_%.bbappend b/recipes-core/psplash/psplash_%.bbappend
index 57cade8ff..bf99b2bff 100644
--- a/recipes-core/psplash/psplash_%.bbappend
+++ b/recipes-core/psplash/psplash_%.bbappend
@@ -1,12 +1,2 @@
 FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
 SPLASH_IMAGES:rpi = "file://psplash-raspberrypi-img.h;outsuffix=raspberrypi"
-
-SRC_URI:append:rpi = " file://framebuf.conf"
-
-do_install:append:rpi() {
-    if [ "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" ]; then
-        install -Dm 0644 ${WORKDIR}/framebuf.conf ${D}${systemd_system_unitdir}/psplash-start.service.d/framebuf.conf
-    fi
-}
-
-FILES:${PN}:append:rpi = " ${systemd_system_unitdir}/psplash-start.service.d"
diff --git a/recipes-core/udev/udev-rules-rpi.bb b/recipes-core/udev/udev-rules-rpi.bb
index 3ae43856f..67ead13bb 100644
--- a/recipes-core/udev/udev-rules-rpi.bb
+++ b/recipes-core/udev/udev-rules-rpi.bb
@@ -5,6 +5,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda
 SRC_URI = " \
 	git://github.com/RPi-Distro/raspberrypi-sys-mods;protocol=https;branch=master \
 	file://can.rules \
+	file://fb.rules \
 	"
 SRCREV = "5ce3ef2b7f377c23fea440ca9df0e30f3f8447cf"
 
@@ -16,4 +17,5 @@ do_install () {
     install -d ${D}${sysconfdir}/udev/rules.d
     install -m 0644 ${S}/etc.armhf/udev/rules.d/99-com.rules ${D}${sysconfdir}/udev/rules.d/
     install -m 0644 ${WORKDIR}/can.rules ${D}${sysconfdir}/udev/rules.d/
+    install -m 0644 ${WORKDIR}/fb.rules ${D}${sysconfdir}/udev/rules.d/
 }
diff --git a/recipes-core/udev/udev-rules-rpi/fb.rules b/recipes-core/udev/udev-rules-rpi/fb.rules
new file mode 100644
index 000000000..dcaa129c9
--- /dev/null
+++ b/recipes-core/udev/udev-rules-rpi/fb.rules
@@ -0,0 +1 @@
+SUBSYSTEM=="graphics", KERNEL=="fb[0-9]*", TAG+="systemd"