diff --git a/templates/libX11-devel b/templates/libX11-devel
new file mode 120000
index 00000000000..71edfe2e3b8
--- /dev/null
+++ b/templates/libX11-devel
@@ -0,0 +1 @@
+libX11
\ No newline at end of file
diff --git a/templates/libX11/devel.template b/templates/libX11/devel.template
new file mode 100644
index 00000000000..a7e4fb32244
--- /dev/null
+++ b/templates/libX11/devel.template
@@ -0,0 +1,20 @@
+# Template file for 'libX11-devel'.
+#
+short_desc="${short_desc} (development files)"
+long_desc="${long_desc}
+
+ This package contains files for development, headers, static libs, etc."
+
+Add_dependency run libX11
+
+do_install()
+{
+	mkdir -p ${DESTDIR}/usr/lib
+	mkdir -p ${DESTDIR}/usr/share/man
+	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
+	mv ${SRCPKGDESTDIR}/usr/lib/lib*.*a ${DESTDIR}/usr/lib
+	mv ${SRCPKGDESTDIR}/usr/lib/lib*.so ${DESTDIR}/usr/lib
+	mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
+	mv ${SRCPKGDESTDIR}/usr/share/man/man3 ${DESTDIR}/usr/share/man
+	rm -rf ${SRCPKGDESTDIR}/usr/share/man
+}
diff --git a/templates/libX11/template b/templates/libX11/template
index b849b86e818..f633b6ca5e6 100644
--- a/templates/libX11/template
+++ b/templates/libX11/template
@@ -1,5 +1,6 @@
 # Template build file for 'libX11'.
 pkgname=libX11
+sourcepkg=$pkgname
 version=1.2
 distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
@@ -13,6 +14,7 @@ long_desc="
 
  This is from the modular X.org X11 project."
 
+subpackages="devel"
 Add_dependency build pkg-config
 Add_dependency build xproto
 Add_dependency build xextproto