diff --git a/templates/font-adobe-100dpi/template b/templates/font-adobe-100dpi/template
index ef76da3a729..bd5da809ef9 100644
--- a/templates/font-adobe-100dpi/template
+++ b/templates/font-adobe-100dpi/template
@@ -1,13 +1,11 @@
 # Template build file for 'font-adobe-100dpi'.
 pkgname=font-adobe-100dpi
 version=1.0.0
-distfiles="
-http://xorg.freedesktop.org/releases/individual/font/$pkgname-$version.tar.bz2"
+distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
-make_cmd="$XBPS_MASTERDIR/bin/gmake"
 short_desc="Standard 100dpi Adobe PCF fonts"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=34a3af933a71062f27d1b6b305a497e9e9f2606d
+checksum=f16c1b3a1625c9a225aff2ac12067bd3907d157b0c60625689a5080f092e9a19
 long_desc="
  Theses are the PCF versions of the following Adobe fonts for 100dpi displays:
   - Courier
@@ -18,7 +16,13 @@ long_desc="
 
  This is from the modular Xorg project."
 
-# Build fonts.dir and fonts.scale files after install.
-fonts_dir="$XBPS_MASTERDIR/lib/X11/fonts/100dpi"
-postinstall_helpers="mkfontxx-rebuild.sh"
-ignore_files="fonts.scale fonts.dir"
+Add_dependency full font-util
+
+noarch=yes
+font_dirs="/usr/lib/X11/fonts/100dpi"
+triggers="x11-fonts"
+
+post_install()
+{
+	rm -f ${DESTDIR}/${font_dirs}/fonts.*
+}
diff --git a/templates/font-adobe-75dpi/template b/templates/font-adobe-75dpi/template
index df6899d9b1a..fdd01e4c10f 100644
--- a/templates/font-adobe-75dpi/template
+++ b/templates/font-adobe-75dpi/template
@@ -1,13 +1,11 @@
 # Template build file for 'font-adobe-75dpi'.
 pkgname=font-adobe-75dpi
 version=1.0.0
-distfiles="
-http://xorg.freedesktop.org/releases/individual/font/$pkgname-$version.tar.bz2"
+distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
-make_cmd="$XBPS_MASTERDIR/bin/gmake"
 short_desc="Standard 75pi Adobe PCF fonts"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=348e233516806415e2e190ec4af7ea09f5d33fb9
+checksum=d62745bee0f5e4f355f237020667d783ae9fea5f18a864d748ae1287bd176339
 long_desc="
  These are the PCF versions of the following Adobe fonts for 75dpi displays:
   - Courier
@@ -18,7 +16,13 @@ long_desc="
 
  This is from the modular Xorg project."
 
-# Build fonts.dir and fonts.scale files after install.
-fonts_dir="$XBPS_MASTERDIR/lib/X11/fonts/100dpi"
-postinstall_helpers="mkfontxx-rebuild.sh"
-ignore_files="fonts.scale fonts.dir"
+Add_dependency full font-util
+
+noarch=yes
+font_dirs="/usr/lib/X11/fonts/100dpi"
+triggers="x11-fonts"
+
+post_install()
+{
+	rm -f ${DESTDIR}/${font_dirs}/fonts.*
+}
diff --git a/templates/font-adobe-utopia-100dpi/template b/templates/font-adobe-utopia-100dpi/template
index 4889481c8cb..9c8b2ec9d84 100644
--- a/templates/font-adobe-utopia-100dpi/template
+++ b/templates/font-adobe-utopia-100dpi/template
@@ -1,20 +1,24 @@
 # Template build file for 'font-adobe-utopia-100dpi'.
 pkgname=font-adobe-utopia-100dpi
 version=1.0.1
-distfiles="
-http://xorg.freedesktop.org/releases/individual/font/$pkgname-$version.tar.bz2"
+distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
-make_cmd="$XBPS_MASTERDIR/bin/gmake"
 short_desc="100dpi Adobe Utopia PCF fonts"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=fb6cdba17598655226b9885b47961184de327d10
+checksum=1943e1aa70c169b13bc7a308c8e949267f9ce6327479803203fbf10c06a9b5fe
 long_desc="
  These are the PCF versions of the following Adobe fonts for 100dpi displays:
   - Adobe Utopia
 
  This is from the modular Xorg project."
 
-# Build fonts.dir and fonts.scale files after install.
-fonts_dir="$XBPS_MASTERDIR/lib/X11/fonts/100dpi"
-postinstall_helpers="mkfontxx-rebuild.sh"
-ignore_files="fonts.scale fonts.dir"
+Add_dependency full font-util
+
+noarch=yes
+font_dirs="/usr/lib/X11/fonts/100dpi"
+triggers="x11-fonts"
+
+post_install()
+{
+	rm -f ${DESTDIR}/${font_dirs}/fonts.*
+}
diff --git a/templates/font-adobe-utopia-75dpi/template b/templates/font-adobe-utopia-75dpi/template
index 9171c057809..d2816206cef 100644
--- a/templates/font-adobe-utopia-75dpi/template
+++ b/templates/font-adobe-utopia-75dpi/template
@@ -1,20 +1,24 @@
 # Template build file for 'font-adobe-utopia-75dpi'.
 pkgname=font-adobe-utopia-75dpi
 version=1.0.1
-distfiles="
-http://xorg.freedesktop.org/releases/individual/font/$pkgname-$version.tar.bz2"
+distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
-make_cmd="$XBPS_MASTERDIR/bin/gmake"
 short_desc="100dpi Adobe Utopia PCF fonts"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=0c4a7ef7fe8f5c688ceaebd1f5f6e6a2a1920813
+checksum=ebd4e2194bbc727e3bbda0f5dc1493fe3a211c7cf77e3d41f93135dd04ca7089
 long_desc="
  These are the PCF versions of the following Adobe fonts for 75dpi displays:
   - Adobe Utopia
 
  This is from the modular Xorg project."
 
-# Build fonts.dir and fonts.scale files after install.
-fonts_dir="$XBPS_MASTERDIR/lib/X11/fonts/75dpi"
-postinstall_helpers="mkfontxx-rebuild.sh"
-ignore_files="fonts.scale fonts.dir"
+Add_dependency full font-util
+
+noarch=yes
+font_dirs="/usr/lib/X11/fonts/75dpi"
+triggers="x11-fonts"
+
+post_install()
+{
+	rm -f ${DESTDIR}/${font_dirs}/fonts.*
+}
diff --git a/templates/font-adobe-utopia-type1/template b/templates/font-adobe-utopia-type1/template
index 99b99764ebe..84bb76892a5 100644
--- a/templates/font-adobe-utopia-type1/template
+++ b/templates/font-adobe-utopia-type1/template
@@ -1,20 +1,24 @@
 # Template build file for 'font-adobe-utopia-type1'.
 pkgname=font-adobe-utopia-type1
 version=1.0.1
-distfiles="
-http://xorg.freedesktop.org/releases/individual/font/$pkgname-$version.tar.bz2"
+distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
-make_cmd="$XBPS_MASTERDIR/bin/gmake"
 short_desc="Adobe Utopia Type1 fonts"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=73cf16a10870d134526feb4db5877a193a49a4db
+checksum=e9c672c8ff275fd5c2d76dda9a9f11138766e246e31e45763cd7e14d8824c0dc
 long_desc="
  This are the Type1 versions of the following Adobe fonts:
   - Adobe Utopia
 
  This is from the modular Xorg project."
 
-# Build fonts.dir and fonts.scale files after install.
-fonts_dir="$XBPS_MASTERDIR/lib/X11/fonts/Type1"
-postinstall_helpers="mkfontxx-rebuild.sh"
-ignore_files="fonts.scale fonts.dir"
+Add_dependency full font-util
+
+noarch=yes
+font_dirs="/usr/lib/X11/fonts/Type1"
+triggers="x11-fonts"
+
+post_install()
+{
+	rm -f ${DESTDIR}/${font_dirs}/fonts.*
+}