diff --git a/dependencies/build-depends.db b/dependencies/build-depends.db
index 24fe2c52fb..25137205a2 100644
Binary files a/dependencies/build-depends.db and b/dependencies/build-depends.db differ
diff --git a/templates/font-bh-ttf.tmpl b/templates/font-bh-ttf.tmpl
new file mode 100755
index 0000000000..df063bcf08
--- /dev/null
+++ b/templates/font-bh-ttf.tmpl
@@ -0,0 +1,22 @@
+# Template build file for 'font-bh-ttf'.
+pkgname=font-bh-ttf
+version=1.0.0
+extract_sufx=".tar.bz2"
+url=http://xorg.freedesktop.org/releases/individual/font
+build_style=gnu_configure
+make_cmd="$PKGFS_MASTERDIR/bin/gmake"
+short_desc="Standard Bigelow & Holmes TrueType fonts"
+maintainer="Juan RP <xtraeme@gmail.com>"
+checksum=fed191717895e0cdbe7c34dbbe94a13e1b823793
+long_desc="
+ This are the TrueType versions of the following Bigelow & 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="$PKGFS_MASTERDIR/lib/X11/fonts/TTF"
+postinstall_helpers="mkfontxx-rebuild.sh"
+ignore_files="fonts.scale fonts.dir"
diff --git a/templates/font-bh-type1.tmpl b/templates/font-bh-type1.tmpl
new file mode 100755
index 0000000000..d05545d2ec
--- /dev/null
+++ b/templates/font-bh-type1.tmpl
@@ -0,0 +1,22 @@
+# Template build file for 'font-bh-type1'.
+pkgname=font-bh-type1
+version=1.0.0
+extract_sufx=".tar.bz2"
+url=http://xorg.freedesktop.org/releases/individual/font
+build_style=gnu_configure
+make_cmd="$PKGFS_MASTERDIR/bin/gmake"
+short_desc="Standard Bigelow & Holmes Type1 fonts"
+maintainer="Juan RP <xtraeme@gmail.com>"
+checksum=bb57ceadc6dfc1b00b513aa7c5a817c916f49098
+long_desc="
+ This are the Type1 versions of the following Bigelow & 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="$PKGFS_MASTERDIR/lib/X11/fonts/Type1"
+postinstall_helpers="mkfontxx-rebuild.sh"
+ignore_files="fonts.scale fonts.dir"