diff --git a/templates/libXxf86vm-devel b/templates/libXxf86vm-devel
new file mode 120000
index 00000000000..050c0f86a86
--- /dev/null
+++ b/templates/libXxf86vm-devel
@@ -0,0 +1 @@
+libXxf86vm
\ No newline at end of file
diff --git a/templates/libXxf86vm/depends b/templates/libXxf86vm/depends
new file mode 100644
index 00000000000..be05a0beba4
--- /dev/null
+++ b/templates/libXxf86vm/depends
@@ -0,0 +1,2 @@
+abi_depends=1.0.2
+api_depends=${abi_depends}
diff --git a/templates/libXxf86vm/devel.template b/templates/libXxf86vm/devel.template
new file mode 100644
index 00000000000..826e9ef5bc5
--- /dev/null
+++ b/templates/libXxf86vm/devel.template
@@ -0,0 +1,17 @@
+# Template file for 'libXxf86vm-devel'.
+#
+short_desc="${short_desc} (development files)"
+long_desc="${long_desc}
+
+ This package contains files for development, headers, static libs, etc."
+
+Add_dependency run libXxf86vm
+
+do_install()
+{
+	mkdir -p ${DESTDIR}/usr/lib
+	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/libXxf86vm/template b/templates/libXxf86vm/template
index f5c13b98f62..91c1d909fc5 100644
--- a/templates/libXxf86vm/template
+++ b/templates/libXxf86vm/template
@@ -1,4 +1,6 @@
+# Template build file for 'libXxf86vm'.
 pkgname=libXxf86vm
+sourcepkg=$pkgname
 version=1.0.2
 distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
@@ -12,7 +14,11 @@ long_desc="
 
  This library is from the modular X.org project."
 
-shared_deps="libX11-1.1 libXext-1.0"
-build_depends="pkg-config-0.23 xproto-7.0 xextproto-7.0 xf86vidmodeproto-2.2
- ${shared_deps}"
-run_depends="glibc-2.8 ${shared_deps}"
+subpackages="devel"
+Add_dependency build pkg-config
+Add_dependency build xproto
+Add_dependency build xextproto
+Add_dependency build xf86vidmodeproto
+Add_dependency full glibc
+Add_dependency full libX11
+Add_dependency full libXext