diff --git a/packages/x11/other/fontconfig/build b/packages/x11/other/fontconfig/build
deleted file mode 100755
index f0919f414f..0000000000
--- a/packages/x11/other/fontconfig/build
+++ /dev/null
@@ -1,46 +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
-################################################################################
-
-. config/options $1
-
-# ensure we dont use '-O3' optimization.
-  CFLAGS=`echo $CFLAGS | sed -e "s|-O3|-O2|"`
-  CXXFLAGS=`echo $CXXFLAGS | sed -e "s|-O3|-O2|"`
-
-cd $PKG_BUILD
-./configure --host=$TARGET_NAME \
-            --build=$HOST_NAME \
-            --prefix=/usr \
-            --sysconfdir=/etc \
-            --localstatedir=/var \
-            --disable-static \
-            --enable-shared \
-            --with-arch=$TARGET_ARCH \
-            --with-freetype-config=$ROOT/$TOOLCHAIN/bin/freetype-config \
-            --with-default-fonts=/usr/share/fonts/liberation \
-            --without-add-fonts \
-            --disable-dependency-tracking \
-            --disable-docs
-
-make V=1
-
-$MAKEINSTALL
diff --git a/packages/x11/other/fontconfig/install b/packages/x11/other/fontconfig/install
deleted file mode 100755
index 9e5ab74174..0000000000
--- a/packages/x11/other/fontconfig/install
+++ /dev/null
@@ -1,38 +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
-################################################################################
-
-. config/options $1
-
-mkdir -p $INSTALL/usr/lib
-  cp -P $PKG_BUILD/src/.libs/libfontconfig.so* $INSTALL/usr/lib
-
-mkdir -p $INSTALL/usr/bin
-  cp $PKG_BUILD/fc-cache/.libs/fc-cache $INSTALL/usr/bin
-
-mkdir -p $INSTALL/usr/share/fontconfig/conf.avail
-  cp $PKG_BUILD/conf.d/*.conf $INSTALL/usr/share/fontconfig/conf.avail
-
-mkdir -p $INSTALL/usr/share/xml/fontconfig
-  cp $PKG_BUILD/fonts.dtd $INSTALL/usr/share/xml/fontconfig
-
-mkdir -p $INSTALL/etc/fonts
-  cp -R $SYSROOT_PREFIX/etc/fonts/* $INSTALL/etc/fonts
diff --git a/packages/x11/other/fontconfig/meta b/packages/x11/other/fontconfig/package.mk
similarity index 63%
rename from packages/x11/other/fontconfig/meta
rename to packages/x11/other/fontconfig/package.mk
index 7a08b5566e..4e69f1d120 100644
--- a/packages/x11/other/fontconfig/meta
+++ b/packages/x11/other/fontconfig/package.mk
@@ -26,11 +26,34 @@ PKG_LICENSE="OSS"
 PKG_SITE="http://www.fontconfig.org"
 PKG_URL="http://www.freedesktop.org/software/fontconfig/release/$PKG_NAME-$PKG_VERSION.tar.gz"
 PKG_DEPENDS="freetype libxml2 zlib expat"
-PKG_BUILD_DEPENDS="toolchain util-macros freetype libxml2 zlib expat"
+PKG_BUILD_DEPENDS_TARGET="toolchain util-macros freetype libxml2 zlib expat"
 PKG_PRIORITY="optional"
 PKG_SECTION="x11/other"
 PKG_SHORTDESC="fontconfig: A library for font customization and configuration"
 PKG_LONGDESC="Fontconfig is a library for font customization and configuration."
-PKG_IS_ADDON="no"
 
+PKG_IS_ADDON="no"
 PKG_AUTORECONF="yes"
+
+PKG_CONFIGURE_OPTS_TARGET="--with-arch=$TARGET_ARCH \
+                           --with-freetype-config=$ROOT/$TOOLCHAIN/bin/freetype-config \
+                           --with-default-fonts=/usr/share/fonts/liberation \
+                           --without-add-fonts \
+                           --disable-dependency-tracking \
+                           --disable-docs"
+
+pre_configure_target() {
+# ensure we dont use '-O3' optimization.
+  CFLAGS=`echo $CFLAGS | sed -e "s|-O3|-O2|"`
+  CXXFLAGS=`echo $CXXFLAGS | sed -e "s|-O3|-O2|"`
+}
+
+post_makeinstall_target() {
+  rm -rf $INSTALL/usr/bin/fc-cat
+  rm -rf $INSTALL/usr/bin/fc-list
+  rm -rf $INSTALL/usr/bin/fc-match
+  rm -rf $INSTALL/usr/bin/fc-pattern
+  rm -rf $INSTALL/usr/bin/fc-query
+  rm -rf $INSTALL/usr/bin/fc-scan
+  rm -rf $INSTALL/usr/bin/fc-validate
+}