diff --git a/README b/README
index 3afd283ecca..b67f957b040 100644
--- a/README
+++ b/README
@@ -66,6 +66,24 @@ To list installed (stowned) packages, use this:
 
 That's all for now folks. I hope you find it useful, as I do.
 
+------------------------------------------------------------------------------
+ PERFORMANCE
 ------------------------------------------------------------------------------
 
+pkgfs is really fast, trust me. That was one of my reasons to make my own
+pkgsrc/ports alike system.
+
+If you want benchmarks, here is one; building libX11 (all deps installed)
+with pkgfs:
+
+	217.00s real   103.23s user    29.96s system
+
+versus pkgsrc (make install clean):
+
+	229.22s real   112.75s user    54.79s system
+
+The difference in this package might not be too big as I might think... but
+anyway, 12 seconds faster is not that bad.
+
+------------------------------------------------------------------------------
 	Juan Romero Pardines <xtraeme@gmail.com>
diff --git a/dependencies/libX11-1.1.5-deps.db b/dependencies/libX11-1.1.5-deps.db
new file mode 100644
index 00000000000..09e1cf4bdbb
Binary files /dev/null and b/dependencies/libX11-1.1.5-deps.db differ
diff --git a/dependencies/libXau-1.0.4-deps.db b/dependencies/libXau-1.0.4-deps.db
new file mode 100644
index 00000000000..f5831e24c98
Binary files /dev/null and b/dependencies/libXau-1.0.4-deps.db differ
diff --git a/dependencies/libXdmcp-1.0.2-deps.db b/dependencies/libXdmcp-1.0.2-deps.db
new file mode 100644
index 00000000000..f5831e24c98
Binary files /dev/null and b/dependencies/libXdmcp-1.0.2-deps.db differ
diff --git a/templates/bigreqsproto-1.0.2.tmpl b/templates/bigreqsproto-1.0.2.tmpl
new file mode 100755
index 00000000000..0188136fd5f
--- /dev/null
+++ b/templates/bigreqsproto-1.0.2.tmpl
@@ -0,0 +1,10 @@
+# Template file for 'bigreqsproto-1.0.2'
+pkgname=bigreqsproto-1.0.2
+extract_sufx=".tar.gz"
+url=http://xorg.freedesktop.org/releases/individual/proto
+build_style=gnu_configure
+short_desc="BigReqs extension headers from modular Xorg X11"
+maintainer="Juan RP <xtraeme@gmail.com>"
+checksum=153bc6e44f7e41743c7a9607173fc2c52301bda4
+long_desc="
+ BigReqs extension headers from modular Xorg X11."
diff --git a/templates/inputproto-1.4.4.tmpl b/templates/inputproto-1.4.4.tmpl
new file mode 100755
index 00000000000..7967523f704
--- /dev/null
+++ b/templates/inputproto-1.4.4.tmpl
@@ -0,0 +1,10 @@
+# Template file for 'inputproto-1.4.4'
+pkgname=inputproto-1.4.4
+extract_sufx=".tar.bz2"
+url=http://xorg.freedesktop.org/releases/individual/proto
+build_style=gnu_configure
+short_desc="Input extension headers from X.org"
+maintainer="Juan RP <xtraeme@gmail.com>"
+checksum=771db687cab6f2e77f36e3efd1bc4793c73b152b
+long_desc="
+ This provides the input extension headers from modular X.org X11 project."
diff --git a/templates/kbproto-1.0.3.tmpl b/templates/kbproto-1.0.3.tmpl
new file mode 100755
index 00000000000..c11ee78ffb9
--- /dev/null
+++ b/templates/kbproto-1.0.3.tmpl
@@ -0,0 +1,10 @@
+# Template file for 'kbproto-1.0.3'
+pkgname=kbproto-1.0.3
+extract_sufx=".tar.bz2"
+url=http://xorg.freedesktop.org/releases/individual/proto
+build_style=gnu_configure
+short_desc="KB extension headers from X.org"
+maintainer="Juan RP <xtraeme@gmail.com>"
+checksum=6547c6482a30c2b7feac09d71e9cc60dd97bc8b4
+long_desc="
+ This provides the KB extension headers from modular X.org X11 project."
diff --git a/templates/libX11-1.1.5.tmpl b/templates/libX11-1.1.5.tmpl
new file mode 100755
index 00000000000..fe9b440ae78
--- /dev/null
+++ b/templates/libX11-1.1.5.tmpl
@@ -0,0 +1,16 @@
+# Template file for 'libX11-1.1.5'
+pkgname=libX11-1.1.5
+extract_sufx=".tar.bz2"
+url=http://xorg.freedesktop.org/releases/individual/lib
+build_style=gnu_configure
+make_cmd="$PKGFS_MASTERDIR/bin/gmake"
+configure_args="--enable-man-pages=3 --without-xcb
+ --disable-malloc0returnsnull"
+short_desc="Base X libraries from modular Xorg X11"
+maintainer="Juan RP <xtraeme@gmail.com>"
+checksum=78567a999640851e7daba1ab44603ec099d0b619
+long_desc="
+ This is the libX11 library that is the C binding to the X protocol. It
+ is the foundation of practically every X Window System program out there.
+
+ This is from the modular X.org X11 project."
diff --git a/templates/libXau-1.0.4.tmpl b/templates/libXau-1.0.4.tmpl
new file mode 100755
index 00000000000..d30fe7d91ff
--- /dev/null
+++ b/templates/libXau-1.0.4.tmpl
@@ -0,0 +1,11 @@
+# Template file for 'libXau-1.0.4'
+pkgname=libXau-1.0.4
+extract_sufx=".tar.bz2"
+url=http://xorg.freedesktop.org/releases/individual/lib
+build_style=gnu_configure
+short_desc="Authorization Protocol for X from X.org"
+maintainer="Juan RP <xtraeme@gmail.com>"
+checksum=9ca0318c62b6bcf97b8460fd89b0788b07f459ca
+long_desc="
+ LibXau is an authorization protocol for X from the modular
+ X.org X11 project."
diff --git a/templates/libXdmcp-1.0.2.tmpl b/templates/libXdmcp-1.0.2.tmpl
new file mode 100755
index 00000000000..50fa6474dd6
--- /dev/null
+++ b/templates/libXdmcp-1.0.2.tmpl
@@ -0,0 +1,11 @@
+# Template file for 'libXdmcp-1.0.2'
+pkgname=libXdmcp-1.0.2
+extract_sufx=".tar.bz2"
+url=http://xorg.freedesktop.org/releases/individual/lib
+build_style=gnu_configure
+short_desc="X Display Manager Control Protocol library from X.org"
+maintainer="Juan RP <xtraeme@gmail.com>"
+checksum=b1172f757623bd5f3671692d0ae920205404792b
+long_desc="
+ This is the X Display Manager Control Protocol library. This is
+ from the modular X.org X11 project."
diff --git a/templates/xcmiscproto-1.1.2.tmpl b/templates/xcmiscproto-1.1.2.tmpl
new file mode 100755
index 00000000000..024b29f6cf3
--- /dev/null
+++ b/templates/xcmiscproto-1.1.2.tmpl
@@ -0,0 +1,10 @@
+# Template file for 'xcmiscproto-1.1.2'
+pkgname=xcmiscproto-1.1.2
+extract_sufx=".tar.bz2"
+url=http://xorg.freedesktop.org/releases/individual/proto
+build_style=gnu_configure
+short_desc="XCMisc extension headers from X.org"
+maintainer="Juan RP <xtraeme@gmail.com>"
+checksum=375efab5b1ba235687cc3cfa58d33fb690f76028
+long_desc="
+ This provides the XCMisc extension headers from modular X.org project."
diff --git a/templates/xextproto-7.0.3.tmpl b/templates/xextproto-7.0.3.tmpl
new file mode 100755
index 00000000000..ad3532a97aa
--- /dev/null
+++ b/templates/xextproto-7.0.3.tmpl
@@ -0,0 +1,10 @@
+# Template file for 'xextproto-7.0.3'
+pkgname=xextproto-7.0.3
+extract_sufx=".tar.bz2"
+url=http://xorg.freedesktop.org/releases/individual/proto
+build_style=gnu_configure
+short_desc="XExt extension headers from X.org"
+maintainer="Juan RP <xtraeme@gmail.com>"
+checksum=a39e2c42fec5fa7b6e5ac7517c8645dcfc1347a6
+long_desc="
+ This provides the XExt extension headers from modular X.org project."
diff --git a/templates/xf86bigfontproto-1.1.2.tmpl b/templates/xf86bigfontproto-1.1.2.tmpl
new file mode 100755
index 00000000000..d1fbf6e42f9
--- /dev/null
+++ b/templates/xf86bigfontproto-1.1.2.tmpl
@@ -0,0 +1,10 @@
+# Template file for 'xf86bigfontproto-1.1.2'
+pkgname=xf86bigfontproto-1.1.2
+extract_sufx=".tar.bz2"
+url=http://xorg.freedesktop.org/releases/individual/proto
+build_style=gnu_configure
+short_desc="XF86BigFont extension headers from X.org"
+maintainer="Juan RP <xtraeme@gmail.com>"
+checksum=48d7bbedfaf5061e76f8207570ca547ff53f44e0
+long_desc="
+ This provides the XF86BigFont extension headers from modular X.org X11 project."
diff --git a/templates/xproto-7.0.13.tmpl b/templates/xproto-7.0.13.tmpl
new file mode 100755
index 00000000000..f7e6ea11d14
--- /dev/null
+++ b/templates/xproto-7.0.13.tmpl
@@ -0,0 +1,10 @@
+# Template file for 'xproto-7.0.13'
+pkgname=xproto-7.0.13
+extract_sufx=".tar.bz2"
+url=http://xorg.freedesktop.org/releases/individual/proto
+build_style=gnu_configure
+short_desc="X protocol and ancillary headers from Xorg X11"
+maintainer="Juan RP <xtraeme@gmail.com>"
+checksum=24d55b70cd36dab9e5f08f7de59825c52b81beee
+long_desc="
+ X protocol and ancillary headers from modular Xorg X11."
diff --git a/templates/xtrans-1.2.1.tmpl b/templates/xtrans-1.2.1.tmpl
new file mode 100755
index 00000000000..7927dacd893
--- /dev/null
+++ b/templates/xtrans-1.2.1.tmpl
@@ -0,0 +1,12 @@
+# Template file for 'xtrans-1.2.1'
+pkgname=xtrans-1.2.1
+extract_sufx=".tar.bz2"
+url=http://xorg.freedesktop.org/releases/individual/lib
+build_style=gnu_configure
+short_desc="Network API translation layer to insulate X"
+maintainer="Juan RP <xtraeme@gmail.com>"
+checksum=1998ba12f64cfc9563dcb20f9337e448a9e6a882
+long_desc="
+ Network API translation layer to insulate X applications and
+ libraries from OS network vageries. This is from the modular
+ X.org X11 project."