diff --git a/templates/libXinerama-devel b/templates/libXinerama-devel
new file mode 120000
index 00000000000..f625f57c009
--- /dev/null
+++ b/templates/libXinerama-devel
@@ -0,0 +1 @@
+libXinerama
\ No newline at end of file
diff --git a/templates/libXinerama/depends b/templates/libXinerama/depends
new file mode 100644
index 00000000000..e9365df6371
--- /dev/null
+++ b/templates/libXinerama/depends
@@ -0,0 +1,2 @@
+abi_depends=1.0.3
+api_depends=${abi_depends}
diff --git a/templates/libXinerama/devel.template b/templates/libXinerama/devel.template
new file mode 100644
index 00000000000..e97b03de2ab
--- /dev/null
+++ b/templates/libXinerama/devel.template
@@ -0,0 +1,17 @@
+# Template file for 'libXinerama-devel'.
+#
+short_desc="${short_desc} (development files)"
+long_desc="${long_desc}
+
+ This package contains files for development, headers, static libs, etc."
+
+Add_dependency run libXinerama
+
+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/libXinerama/template b/templates/libXinerama/template
index 91eb0c82410..d388791b328 100644
--- a/templates/libXinerama/template
+++ b/templates/libXinerama/template
@@ -1,4 +1,6 @@
+# Template build file for 'libXinerama'.
 pkgname=libXinerama
+sourcepkg=$pkgname
 version=1.0.3
 distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
@@ -8,6 +10,11 @@ checksum=07b3564cd56154c20580b56230b7a95d74fe6582c80cedf0550d8d7955181219
 long_desc="
  libXinerama provides X PanoramiX extension library."
 
-shared_deps="libX11-1.1 libXext-1.0"
-build_depends="pkg-config-0.23 xextproto-7.0 xineramaproto-1.0 ${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 xineramaproto
+Add_dependency full glibc
+Add_dependency full libX11
+Add_dependency full libXext