diff --git a/templates/libXrandr-devel b/templates/libXrandr-devel
new file mode 120000
index 00000000000..b7f6714e7bc
--- /dev/null
+++ b/templates/libXrandr-devel
@@ -0,0 +1 @@
+libXrandr
\ No newline at end of file
diff --git a/templates/libXrandr/depends b/templates/libXrandr/depends
new file mode 100644
index 00000000000..3f96ca02169
--- /dev/null
+++ b/templates/libXrandr/depends
@@ -0,0 +1,2 @@
+abi_depends=1.3.0
+api_depends=${abi_depends}
diff --git a/templates/libXrandr/devel.template b/templates/libXrandr/devel.template
new file mode 100644
index 00000000000..bfecf07bb8d
--- /dev/null
+++ b/templates/libXrandr/devel.template
@@ -0,0 +1,18 @@
+# Template file for 'libXrandr-devel'.
+#
+short_desc="${short_desc} (development files)"
+long_desc="${long_desc}
+
+ This package contains files for development, headers, static libs, etc."
+
+Add_dependency run libXrandr
+
+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/libXrandr/template b/templates/libXrandr/template
index 48825afea87..dd3cb90496f 100644
--- a/templates/libXrandr/template
+++ b/templates/libXrandr/template
@@ -1,10 +1,12 @@
+# Template build file for 'libXrandr'.
 pkgname=libXrandr
-version=1.2.3
+sourcepkg=$pkgname
+version=1.3.0
 distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
 short_desc="X RandR Library from X.org"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=f8edfe26b8c4c3677a3a949f81a8b09a5fad62972020bfd230401e11cc0ed267
+checksum=5961ce0f77c5173a8208b3ed669ac01719f2bf4a10517ffa6c33a5e064802e78
 long_desc="
  This package provides the X RandR Library from the modular X.org
  X11 project.
@@ -14,7 +16,13 @@ long_desc="
  the size and rotation of the root window of a screen, along with
  the ability to reflect the screen about either axis."
 
-shared_deps="libX11-1.1 libXext-1.0 libXrender-0.9"
-build_depends="pkg-config-0.23 xproto-7.0 xextproto-7.0 renderproto-1.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 renderproto
+Add_dependency build randrproto
+Add_dependency full glibc
+Add_dependency full libX11
+Add_dependency full libXext
+Add_dependency full libXrender