diff --git a/dependencies/build-depends.db b/dependencies/build-depends.db
index ee6ed03d647..bccfd057d4e 100644
Binary files a/dependencies/build-depends.db and b/dependencies/build-depends.db differ
diff --git a/templates/font-bitstream-75dpi.tmpl b/templates/font-bitstream-75dpi.tmpl
new file mode 100755
index 00000000000..eed4c49a0d8
--- /dev/null
+++ b/templates/font-bitstream-75dpi.tmpl
@@ -0,0 +1,21 @@
+# Template build file for 'font-bitstream-75dpi'.
+pkgname=font-bitstream-75dpi
+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 100dpi Bitstream PCF fonts"
+maintainer="Juan RP <xtraeme@gmail.com>"
+checksum=b8218eb4bf25a5bda69a5034f8b582824b0b13f4
+long_desc="
+ This are the PCF versions of the following Bitstream fonts for 75dpi displays:
+  - Charter
+  - Terminal
+
+ This is from the modular Xorg project."
+
+# Build fonts.dir and fonts.scale files after install.
+fonts_dir="$PKGFS_MASTERDIR/lib/X11/fonts/75dpi"
+postinstall_helpers="mkfontxx-rebuild.sh"
+ignore_files="fonts.scale fonts.dir"
diff --git a/templates/font-bitstream-speedo.tmpl b/templates/font-bitstream-speedo.tmpl
new file mode 100755
index 00000000000..3f15573bfb8
--- /dev/null
+++ b/templates/font-bitstream-speedo.tmpl
@@ -0,0 +1,20 @@
+# Template build file for 'font-bitstream-speedo'.
+pkgname=font-bitstream-speedo
+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 Speedo Bitstream PCF fonts"
+maintainer="Juan RP <xtraeme@gmail.com>"
+checksum=5b6a215a1e2f857fe48ea4e416260ddec92f3df7
+long_desc="
+ This are the PCF versions of the following Speedo Bitstream fonts:
+  - Speedo
+
+ This is from the modular Xorg project."
+
+# Build fonts.dir and fonts.scale files after install.
+fonts_dir="$PKGFS_MASTERDIR/lib/X11/fonts/Speedo"
+postinstall_helpers="mkfontxx-rebuild.sh"
+ignore_files="fonts.scale fonts.dir"
diff --git a/templates/font-bitstream-type1.tmpl b/templates/font-bitstream-type1.tmpl
new file mode 100755
index 00000000000..e29cdfade98
--- /dev/null
+++ b/templates/font-bitstream-type1.tmpl
@@ -0,0 +1,20 @@
+# Template build file for 'font-bitstream-type1'.
+pkgname=font-bitstream-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 Type1 Bitstream PCF fonts"
+maintainer="Juan RP <xtraeme@gmail.com>"
+checksum=7648f71312d2b79034ee00037a79dc0568450251
+long_desc="
+ This are the PCF versions of the following Type1 Bitstream fonts:
+  - Type1
+
+ 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"