diff --git a/xorg-font-utils/PKGBUILD b/xorg-font-utils/PKGBUILD
index b2e221e8e..6a7d5c11c 100644
--- a/xorg-font-utils/PKGBUILD
+++ b/xorg-font-utils/PKGBUILD
@@ -1,38 +1,24 @@
-#
-# Chakra Packages for Chakra, part of chakra-project.org
-#
-# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
-# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
+# Maintainer: Neophytos Kolokotronis <tetris4 AT gmail DOT com>
 
 pkgname=xorg-font-utils
 pkgver=7.6
-pkgrel=1
+pkgrel=2
 pkgdesc="X.Org font utilities"
-arch=(i686 x86_64)
+arch=(x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
-depends=('gcc-libs' 'sh' 'libxfont>=1.4.1' 'libfontenc>=1.0.5' 'xproto>=7.0.16')
-makedepends=('pkgconfig' 'bigreqsproto>=1.1.0')
-replaces=('font-util')
-provides=('font-util')
-conflicts=('font-util')
+depends=('gcc-libs' 'sh' 'libxfont' 'libfontenc' 'xproto')
+makedepends=('pkgconfig' 'bigreqsproto')
 install=xorg-font-utils.install
-source=(${url}/releases/individual/app/bdftopcf-1.0.3.tar.bz2
-        ${url}/releases/individual/app/fonttosfnt-1.0.4.tar.bz2
-        ${url}/releases/individual/app/mkfontdir-1.0.6.tar.bz2
-        ${url}/releases/individual/app/mkfontscale-1.0.8.tar.bz2
-        ${url}/releases/individual/font/font-util-1.2.0.tar.bz2
-        http://people.redhat.com/yshao/ttmkfdir2.20021109.tar.bz2
-        ttmkfdir.patch
-        gcc-4.3.patch)
-md5sums=('4a7a4a848c43c42f7d499b60666434a4'
-         '07607b26fce3bdc2b204ff3bc43d3ac3'
-         'dc342dd8858416254bb5f71a9ddce589'
-         '5210c9385c6cc4a00ce829d8dc9c819b'
-         '1bdd8ed070e02b2165d7b0f0ed93280b'
-         '79e0401393c9728865aa73bb2bd68dd4'
-         '099278628ad63631e872bc5590bade74'
-         '92ef5f77a467cc188f8dec87b0fdb664')
+source=(${url}/releases/individual/app/bdftopcf-1.0.4.tar.bz2
+        ${url}/releases/individual/app/mkfontdir-1.0.7.tar.bz2
+        ${url}/releases/individual/app/mkfontscale-1.1.1.tar.bz2
+        ${url}/releases/individual/font/font-util-1.3.0.tar.bz2)
+md5sums=('96a648a332160a7482885800f7a506fa'
+         '18c429148c96c2079edda922a2b67632'
+         '03de3f15db678e277f5ef9c013aca1ad'
+         'ddfc8a89d597651408369d940d03d06b')
+
 
 build() {
   cd "${srcdir}"
@@ -40,21 +26,11 @@ build() {
   for i in *; do
     if [ -d "${i}" ]; then
       pushd "${i}"
-      if [ "${i}" = "ttmkfdir2" ]; then
-        patch -Np0 -i "${srcdir}/ttmkfdir.patch" || return 1
-        patch -Np1 -i "${srcdir}/gcc-4.3.patch" || return 1
-        make || return 1
-        install -m755 -d "${pkgdir}/usr/bin"
-        install -m755 ttmkfdir "${pkgdir}/usr/bin/" || return 1
-        install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-        echo "Unknown license" > "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.ttmkfdir2" || return 1
-	    else
         ./configure --prefix=/usr --mandir=/usr/share/man \
-            --with-mapdir=/usr/share/fonts/util --with-fontrootdir=/usr/share/fonts || return 1
-        make || return 1
-        make DESTDIR="${pkgdir}" install || return 1
-        install -D -m644 COPYING "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE.${i%-*} || return 1
-      fi
+        --with-mapdir=/usr/share/fonts/util --with-fontrootdir=/usr/share/fonts
+        make
+        make DESTDIR="${pkgdir}" install
+        install -D -m644 COPYING "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE.${i%-*}
       popd
     fi
   done