diff --git a/templates/libXfixes-devel b/templates/libXfixes-devel
new file mode 120000
index 00000000000..5b7157eaba1
--- /dev/null
+++ b/templates/libXfixes-devel
@@ -0,0 +1 @@
+libXfixes
\ No newline at end of file
diff --git a/templates/libXfixes/depends b/templates/libXfixes/depends
new file mode 100644
index 00000000000..42d0a3db998
--- /dev/null
+++ b/templates/libXfixes/depends
@@ -0,0 +1,2 @@
+abi_depends=4.0.3
+api_depends=${abi_depends}
diff --git a/templates/libXfixes/devel.template b/templates/libXfixes/devel.template
new file mode 100644
index 00000000000..94682b26157
--- /dev/null
+++ b/templates/libXfixes/devel.template
@@ -0,0 +1,18 @@
+# Template file for 'libXfixes-devel'.
+#
+short_desc="${short_desc} (development files)"
+long_desc="${long_desc}
+
+ This package contains files for development, headers, static libs, etc."
+
+Add_dependency run libXfixes
+
+do_install()
+{
+	mkdir -p ${DESTDIR}/usr/lib
+	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 ${DESTDIR}/usr
+}
diff --git a/templates/libXfixes/template b/templates/libXfixes/template
index 7961e2d3d87..216ea7b8371 100644
--- a/templates/libXfixes/template
+++ b/templates/libXfixes/template
@@ -1,4 +1,6 @@
+# Template build file for 'libXfixes'.
 pkgname=libXfixes
+sourcepkg=$pkgname
 version=4.0.3
 distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
@@ -14,6 +16,9 @@ long_desc="
  This package provides the libXFixes library from the modular X.org
  X11 project."
 
-shared_deps="libX11-1.1"
-build_depends="pkg-config-0.23 xproto-7.0 fixesproto-4.0 ${shared_deps}"
-run_depends="glibc-2.8 ${shared_deps}"
+subpackages="devel"
+Add_dependency build pkg-config
+Add_dependency build xproto
+Add_dependency build fixesproto
+Add_dependency full glibc
+Add_dependency full libX11