diff --git a/srcpkgs/libXrandr/libXrandr-devel.template b/srcpkgs/libXrandr/libXrandr-devel.template
index 45c8abd6b6..270160380c 100644
--- a/srcpkgs/libXrandr/libXrandr-devel.template
+++ b/srcpkgs/libXrandr/libXrandr-devel.template
@@ -1,18 +1,14 @@
 # Template file for 'libXrandr-devel'.
 #
-depends="pkg-config xproto xextproto renderproto randrproto libX11-devel libXext-devel libXrender-devel libXrandr"
-short_desc="${short_desc} (development files)"
+depends="libXext-devel libXrender-devel randrproto>=1.4.0 libXrandr>=$version"
+short_desc="${short_desc} -- development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-
-
-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/pkgconfig ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/share ${DESTDIR}/usr
+do_install() {
+	vmove usr/include usr
+	vmove "usr/lib/*.a" usr/lib
+	vmove usr/lib/pkgconfig usr/lib
+	vmove usr/share usr
 }
diff --git a/srcpkgs/libXrandr/template b/srcpkgs/libXrandr/template
index b85483da46..cae8af8c51 100644
--- a/srcpkgs/libXrandr/template
+++ b/srcpkgs/libXrandr/template
@@ -1,13 +1,16 @@
 # Template build file for 'libXrandr'.
 pkgname=libXrandr
-version=1.3.1
-distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2"
+version=1.4.0
+revision=1
 build_style=gnu-configure
-revision=2
-makedepends="pkg-config xproto xextproto renderproto randrproto libX11-devel libXext-devel libXrender-devel"
+subpackages="$pkgname-devel"
+makedepends="pkg-config randrproto>=1.4.0 libXext-devel libXrender-devel"
 short_desc="X RandR Library from X.org"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=62bba708649c04cbbc2f5de910942a01cc727b27225bc06169af8a89b957c661
+homepage="http://xorg.freedesktop.org/"
+license="MIT"
+distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2"
+checksum=033ad0ac2f012afb05268660f6d78705c85f84689f92fa7b47ce12959b15f5c3
 long_desc="
  This package provides the X RandR Library from the modular X.org
  X11 project.
@@ -16,6 +19,3 @@ long_desc="
  Rotate, and Reflection Extension. This allows clients to change
  the size and rotation of the root window of a screen, along with
  the ability to reflect the screen about either axis."
-
-subpackages="$pkgname-devel"
-