diff --git a/packages/mediacenter/xbmc/package.mk b/packages/mediacenter/xbmc/package.mk
index b9fd0a7456..16e0c5337c 100644
--- a/packages/mediacenter/xbmc/package.mk
+++ b/packages/mediacenter/xbmc/package.mk
@@ -457,7 +457,6 @@ post_makeinstall_target() {
     cp $PKG_DIR/scripts/xbmc-config $INSTALL/usr/lib/xbmc
     cp $PKG_DIR/scripts/xbmc-hacks $INSTALL/usr/lib/xbmc
     cp $PKG_DIR/scripts/xbmc-sources $INSTALL/usr/lib/xbmc
-    cp $PKG_DIR/scripts/xbmc-userfonts $INSTALL/usr/lib/xbmc
 
   mkdir -p $INSTALL/usr/bin
     cp $PKG_DIR/scripts/cputemp $INSTALL/usr/bin
@@ -540,7 +539,6 @@ post_install() {
   enable_service xbmc-halt.service
   enable_service xbmc-poweroff.service
   enable_service xbmc-reboot.service
-  enable_service xbmc-userfonts.service
   enable_service xbmc-waitonnetwork.service
   enable_service xbmc.service
   enable_service xbmc-lcd-suspend.service
diff --git a/packages/mediacenter/xbmc/scripts/xbmc-userfonts b/packages/mediacenter/xbmc/scripts/xbmc-userfonts
deleted file mode 100755
index 7d50b65c75..0000000000
--- a/packages/mediacenter/xbmc/scripts/xbmc-userfonts
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/sh
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
-#
-#  This Program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2, or (at your option)
-#  any later version.
-#
-#  This Program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with OpenELEC.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-SUBFONTS="/storage/.xbmc/userdata/fonts"
-
-# hack to support user installed fonts
-  if [ -d "$SUBFONTS" ]; then
-    files=$(ls $SUBFONTS/*.[tT][tT][fF] 2>/dev/null | wc -l)
-    if [ "$files" = "0" ]; then
-      cp /usr/share/xbmc/media/Fonts/*.[tT][tT][fF] $SUBFONTS/
-    fi
-      mount --bind $SUBFONTS /usr/share/xbmc/media/Fonts/
-  fi
-
diff --git a/packages/mediacenter/xbmc/system.d/xbmc-userfonts.service b/packages/mediacenter/xbmc/system.d/xbmc-userfonts.service
deleted file mode 100644
index d442514153..0000000000
--- a/packages/mediacenter/xbmc/system.d/xbmc-userfonts.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=XBMC user fonts setup
-Before=xbmc.service
-
-[Service]
-Type=oneshot
-ExecStart=/usr/lib/xbmc/xbmc-userfonts
-RemainAfterExit=yes
-
-[Install]
-WantedBy=xbmc.service
diff --git a/packages/x11/other/fontconfig/system.d/fc-cache.service b/packages/x11/other/fontconfig/system.d/fc-cache.service
index 7e36cf249d..17a0f280f0 100644
--- a/packages/x11/other/fontconfig/system.d/fc-cache.service
+++ b/packages/x11/other/fontconfig/system.d/fc-cache.service
@@ -6,6 +6,7 @@ Before=graphical.target
 
 [Service]
 Type=oneshot
+# TODO: add /storage/.xbmc/media/Fonts to $FC_CACHE_DIRS ?
 ExecStart=/usr/bin/fc-cache /usr/share/fonts/ /usr/share/xbmc/media/Fonts/
 RemainAfterExit=yes