diff --git a/templates/font-bh-100dpi/template b/templates/font-bh-100dpi/template
index 5cbdee7c593..6638f6e28c6 100644
--- a/templates/font-bh-100dpi/template
+++ b/templates/font-bh-100dpi/template
@@ -1,22 +1,26 @@
 # Template build file for 'font-bh-100dpi'.
 pkgname=font-bh-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 Bigelow & Holmes PCF fonts"
+short_desc="Standard 100dpi Bigelow and Holmes PCF fonts"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=6f0a1719962bb018b5b6ce684ac6e6febf722c07
+checksum=ae8a11777579a2242f52ed19b5fdd6c6ef6fe2c2661a49d0599188de78cfee4a
 long_desc="
- These are the PCF versions of the following Bigelow & Holmes fonts for
- 100dpi displays:
+ These are the PCF versions of the following Bigelow and Holmes fonts
+ for 100dpi displays:
   - Lucida
   - Lucida Bright
 
  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-bh-75dpi/template b/templates/font-bh-75dpi/template
index 37772ae9666..3de31e9f224 100644
--- a/templates/font-bh-75dpi/template
+++ b/templates/font-bh-75dpi/template
@@ -1,22 +1,26 @@
 # Template build file for 'font-bh-75dpi'.
 pkgname=font-bh-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 75dpi Bigelow & Holmes PCF fonts"
+short_desc="Standard 75dpi Bigelow and Holmes PCF fonts"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=3086f534f2dcdb6eedb0b7df36cb0805b3ce7304
+checksum=c79467b440cc9389c75d55fba64d0126d0f2e1e6c019dfafb7d89d07802c05bf
 long_desc="
- These are the PCF versions of the following Bigelow & Holmes fonts for
- 75dpi displays:
+ These are the PCF versions of the following Bigelow and Holmes fonts
+ for 75dpi displays:
   - Lucida
   - Lucida Bright
 
  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-bh-lucidatypewriter-100dpi/template b/templates/font-bh-lucidatypewriter-100dpi/template
index 046f3e0a97c..d22a79612af 100644
--- a/templates/font-bh-lucidatypewriter-100dpi/template
+++ b/templates/font-bh-lucidatypewriter-100dpi/template
@@ -1,21 +1,25 @@
 # Template build file for 'font-bh-lucidatypewriter-100dpi'.
 pkgname=font-bh-lucidatypewriter-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="100dpi Bigelow & Holmes Lucida Typewriter PCF fonts"
+short_desc="100dpi Bigelow and Holmes Lucida Typewriter PCF fonts"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=a396ff6fa3d59ca0c8ec4b0a2ecd9b326fdcebfa
+checksum=36d47dcba591037b6af35fc151e3d7a6c9f16f42b3182e083ea140cb584d7013
 long_desc="
- This are the PCF versions of the following Bigelow & Holmes fonts for
- 100dpi displays:
+ This are the PCF versions of the following Bigelow and Holmes fonts
+ for 100dpi displays:
   - Lucida Typewriter
 
  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-bh-lucidatypewriter-75dpi/template b/templates/font-bh-lucidatypewriter-75dpi/template
index 40f1cbd6238..eb8447d9281 100644
--- a/templates/font-bh-lucidatypewriter-75dpi/template
+++ b/templates/font-bh-lucidatypewriter-75dpi/template
@@ -1,21 +1,25 @@
 # Template build file for 'font-bh-lucidatypewriter-75dpi'.
 pkgname=font-bh-lucidatypewriter-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="75dpi Bigelow & Holmes Lucida Typewriter PCF fonts"
+short_desc="75dpi Bigelow and Holmes Lucida Typewriter PCF fonts"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=a2fa441a655710e602ea56f64d763b43c5a47cb7
+checksum=50f2f36f533a49c65842568052fe4d065354ff6f39ab36dd2129f465741da046
 long_desc="
- This are the PCF versions of the following Bigelow & Holmes fonts for
- 75dpi displays:
+ This are the PCF versions of the following Bigelow and Holmes fonts
+ for 75dpi displays:
   - Lucida Typewriter
 
  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-bh-ttf/template b/templates/font-bh-ttf/template
index 6e5229ec24c..6bb54f8bf8d 100644
--- a/templates/font-bh-ttf/template
+++ b/templates/font-bh-ttf/template
@@ -1,22 +1,26 @@
 # Template build file for 'font-bh-ttf'.
 pkgname=font-bh-ttf
 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 Bigelow & Holmes TrueType fonts"
+short_desc="Standard Bigelow and Holmes TrueType fonts"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=fed191717895e0cdbe7c34dbbe94a13e1b823793
+checksum=7a1a5e72f7e42398b98d70aa64252837e85ed76eea77a1b9a4cd0f1203d7d644
 long_desc="
- This are the TrueType versions of the following Bigelow & Holmes fonts:
+ These are the TrueType versions of the following Bigelow and Holmes fonts:
   - Luxi Mono
   - Luxi Sans
   - Luxi Serif
 
  This is from the modular Xorg project."
 
-# Build fonts.dir and fonts.scale files after install.
-fonts_dir="$XBPS_MASTERDIR/lib/X11/fonts/TTF"
-postinstall_helpers="mkfontxx-rebuild.sh"
-ignore_files="fonts.scale fonts.dir"
+Add_dependency full font-util
+
+noarch=yes
+font_dirs="/usr/lib/X11/fonts/TTF"
+triggers="x11-fonts"
+
+post_install()
+{
+	rm -f ${DESTDIR}/${font_dirs}/fonts.*
+}
diff --git a/templates/font-bh-type1/template b/templates/font-bh-type1/template
index 1a06253c588..73bc25235bd 100644
--- a/templates/font-bh-type1/template
+++ b/templates/font-bh-type1/template
@@ -1,22 +1,26 @@
 # Template build file for 'font-bh-type1'.
 pkgname=font-bh-type1
 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 Bigelow & Holmes Type1 fonts"
+short_desc="Standard Bigelow and Holmes Type1 fonts"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=bb57ceadc6dfc1b00b513aa7c5a817c916f49098
+checksum=5a8a5513f2c829d56043a0f74980efc11b4b4522f21116f16711998f72c3645b
 long_desc="
- This are the Type1 versions of the following Bigelow & Holmes fonts:
+ This are the Type1 versions of the following Bigelow and Holmes fonts:
   - Luxi Mono
   - Luxi Sans
   - Luxi Serif
 
  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.*
+}