diff --git a/projects/Generic/filesystem/usr/bin/intel-fullrange.sh b/projects/Generic/filesystem/usr/bin/intel-fullrange.sh
new file mode 100644
index 0000000000..2b1be600dd
--- /dev/null
+++ b/projects/Generic/filesystem/usr/bin/intel-fullrange.sh
@@ -0,0 +1,16 @@
+#!/bin/sh
+FB_TYPE="$(grep '^0 ' /proc/fb | sed 's/[^[:space:]] //')"
+
+if [ "$FB_TYPE" == "inteldrmfb" ]; then
+  OUTPUT=`/usr/bin/xrandr -display :0 -q | sed '/ connected/!d;s/ .*//;q'`
+  for out in $OUTPUT ; do
+    # Hack - something is not yet fully right
+    /usr/bin/xrandr -display :0 --output $out --set "Broadcast RGB" "Full"
+    /usr/bin/xrandr -display :0 --output $out --set "Broadcast RGB" "Video 16:235 pass-through"
+    # Seems there is a little race somewhere on some outputs
+    # Turn the display shortly off and on again
+    if [ -e "/storage/.config/forcedisplay" ]; then
+      /usr/bin/xrandr -display :0 --output $out --off ; /usr/bin/xrandr -display :0 --output $out --auto
+    fi
+  done
+fi
diff --git a/projects/Generic/filesystem/usr/lib/systemd/system/intel-fullrange-resume.service b/projects/Generic/filesystem/usr/lib/systemd/system/intel-fullrange-resume.service
new file mode 100644
index 0000000000..b10a82ee79
--- /dev/null
+++ b/projects/Generic/filesystem/usr/lib/systemd/system/intel-fullrange-resume.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=Restore full range after suspend
+Before=sleep.target
+StopWhenUnneeded=yes
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+ExecStart=/bin/true
+ExecStop=-/bin/sh "/usr/bin/intel-fullrange.sh"
+
+[Install]
+WantedBy=sleep.target
diff --git a/projects/Generic/filesystem/usr/lib/systemd/system/intel-fullrange.service b/projects/Generic/filesystem/usr/lib/systemd/system/intel-fullrange.service
new file mode 100644
index 0000000000..f1dab89870
--- /dev/null
+++ b/projects/Generic/filesystem/usr/lib/systemd/system/intel-fullrange.service
@@ -0,0 +1,14 @@
+[Unit]
+Description=intel switch to full range
+Before=kodi.service
+After=graphical.target
+
+[Service]
+Type=oneshot
+Environment=DISPLAY=:0.0
+ExecStart=-/bin/sh "/usr/bin/intel-fullrange.sh"
+StandardError=null
+RemainAfterExit=yes
+
+[Install]
+WantedBy=kodi.target