diff --git a/dependencies/build-depends.db b/dependencies/build-depends.db
index 3f56b1f725d..c2291ffa386 100644
Binary files a/dependencies/build-depends.db and b/dependencies/build-depends.db differ
diff --git a/templates/font-cursor-misc.tmpl b/templates/font-cursor-misc.tmpl
new file mode 100755
index 00000000000..906cfe95234
--- /dev/null
+++ b/templates/font-cursor-misc.tmpl
@@ -0,0 +1,19 @@
+# Template build file for 'font-cursor-misc'.
+pkgname=font-cursor-misc
+version=1.0.0
+extract_sufx=".tar.bz2"
+url=http://xorg.freedesktop.org/releases/individual/font
+build_style=gnu_configure
+short_desc="Standard X11 cursors in PCF format"
+maintainer="Juan RP <xtraeme@gmail.com>"
+checksum=f42933e4ed9194f6a9c7c1f8bfe793ed7b3341be
+long_desc="
+ The font-cursor-misc package provides around 75 cursors in the
+ portable PCF format. These include the X cursor, arrows, clock
+ cursor, crosshair, fleur cursor, iron cross, sailboat cursor, and
+ many more."
+
+# Build fonts.dir and fonts.scale files after install.
+fonts_dir="$PKGFS_MASTERDIR/lib/X11/fonts/misc"
+postinstall_helpers="mkfontxx-rebuild.sh"
+ignore_files="fonts.scale fonts.dir"
diff --git a/templates/font-misc-misc.tmpl b/templates/font-misc-misc.tmpl
new file mode 100755
index 00000000000..480f399a5fb
--- /dev/null
+++ b/templates/font-misc-misc.tmpl
@@ -0,0 +1,18 @@
+# Template build file for 'font-misc-misc'.
+pkgname=font-misc-misc
+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 X11 \"fixed\" PCF fonts"
+maintainer="Juan RP <xtraeme@gmail.com>"
+checksum=be44e00d94afdba48002e259f460d6a39ffbb370
+long_desc="
+ The standard X11 public domain \"fixed\" font that you can
+ share and enjoy. It is in PCF format."
+
+# Build fonts.dir and fonts.scale files after install.
+fonts_dir="$PKGFS_MASTERDIR/lib/X11/fonts/misc"
+postinstall_helpers="mkfontxx-rebuild.sh"
+ignore_files="fonts.scale fonts.dir"
diff --git a/templates/xf86-video-vmware.tmpl b/templates/xf86-video-vmware.tmpl
new file mode 100755
index 00000000000..160223bd31e
--- /dev/null
+++ b/templates/xf86-video-vmware.tmpl
@@ -0,0 +1,12 @@
+# Template build file for 'xf86-video-vmware'.
+pkgname=xf86-video-vmware
+version=10.16.4
+extract_sufx=".tar.bz2"
+url=http://xorg.freedesktop.org/releases/individual/driver
+build_style=gnu_configure
+make_cmd="$PKGFS_MASTERDIR/bin/gmake"
+short_desc="Modular Xorg VMware virtual video driver"
+maintainer="Juan RP <xtraeme@gmail.com>"
+checksum=175bf82b20697837356370a96e2bc7bcb2931fb5
+long_desc="
+ This is the VMware virtual video driver for the modular Xorg server."
diff --git a/templates/xrandr.tmpl b/templates/xrandr.tmpl
new file mode 100755
index 00000000000..83c68cb7fa2
--- /dev/null
+++ b/templates/xrandr.tmpl
@@ -0,0 +1,11 @@
+# Template build file for 'xrandr'.
+pkgname=xrandr
+version=1.2.3
+extract_sufx=".tar.bz2"
+url=http://xorg.freedesktop.org/releases/individual/app
+build_style=gnu_configure
+short_desc="Primitive command line interface to RandR extension"
+maintainer="Juan RP <xtraeme@gmail.com>"
+checksum=c73b865598d507708a51af50f755288f91d3480b
+long_desc="
+ Xrandr is used to set the screen size, orientation and/or reflection."
diff --git a/templates/xterm.tmpl b/templates/xterm.tmpl
new file mode 100755
index 00000000000..ca009c0dd0e
--- /dev/null
+++ b/templates/xterm.tmpl
@@ -0,0 +1,23 @@
+# Template build file for 'xterm'.
+pkgname=xterm
+version=2.37
+wrksrc=$pkgname-237
+distfiles="$pkgname-237"
+extract_sufx=".tgz"
+url=ftp://invisible-island.net/xterm
+build_style=gnu_configure
+configure_args="--enable-wide-chars --enable-88-color
+ --enable-256-color --enable-luit --enable-paste64
+ --enable-miniluit --enable-readline-mouse
+ --disable-imake --enable-narrowproto"
+short_desc="Latest terminal emulator for the X window System"
+maintainer="Juan RP <xtraeme@gmail.com>"
+checksum=3e64296f5526dc00024f68695078f90ea9b6550c
+long_desc="
+ The xterm program is a terminal emulator for the X Window System. It provides
+ DEC VT102 and Tektronix 4014 compatible terminals for programs that can't use
+ the window system directly.
+
+ This version implements ISO/ANSI colors using the \"new\" color model
+ (i.e., background color erase). It also implements most of the control
+ sequences for VT220."