diff --git a/packages/graphics/bcm2835-driver/package.mk b/packages/graphics/bcm2835-driver/package.mk
index 2e0a3219da..63cb8f1ffe 100644
--- a/packages/graphics/bcm2835-driver/package.mk
+++ b/packages/graphics/bcm2835-driver/package.mk
@@ -94,6 +94,5 @@ makeinstall_target() {
 }
 
 post_install() {
-  enable_service fbset.service
   enable_service unbind-console.service
 }
diff --git a/packages/graphics/bcm2835-driver/system.d/fbset.service b/packages/graphics/bcm2835-driver/system.d/fbset.service
deleted file mode 100644
index f049271b10..0000000000
--- a/packages/graphics/bcm2835-driver/system.d/fbset.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=Framebuffer setup
-After=multi-user.target
-
-[Service]
-Type=oneshot
-ExecStart=/sbin/fbset -g 1 1 1 1 32
-
-[Install]
-WantedBy=graphical.target
diff --git a/packages/mediacenter/kodi/patches/kodi-999.99.framebuffer-reset.patch b/packages/mediacenter/kodi/patches/kodi-999.99.framebuffer-reset.patch
new file mode 100644
index 0000000000..9358280898
--- /dev/null
+++ b/packages/mediacenter/kodi/patches/kodi-999.99.framebuffer-reset.patch
@@ -0,0 +1,15 @@
+diff --git a/xbmc/XBApplicationEx.cpp b/xbmc/XBApplicationEx.cpp
+index f6fffd8..6eeacf6 100644
+--- a/xbmc/XBApplicationEx.cpp
++++ b/xbmc/XBApplicationEx.cpp
+@@ -85,6 +85,10 @@ INT CXBApplicationEx::Run()
+   unsigned int frameTime = 0;
+   const unsigned int noRenderFrameTime = 15;  // Simulates ~66fps
+ 
++#ifdef TARGET_RASPBERRY_PI
++  system("/sbin/fbset -g 1 1 1 1 32");
++#endif
++
+   // Run xbmc
+   while (!m_bStop)
+   {