diff --git a/srcpkgs/libXinerama/libXinerama-devel.template b/srcpkgs/libXinerama/libXinerama-devel.template
index e97b03de2ab..ddef25bf7ee 100644
--- a/srcpkgs/libXinerama/libXinerama-devel.template
+++ b/srcpkgs/libXinerama/libXinerama-devel.template
@@ -5,11 +5,21 @@ long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
+revision=1
+
+Add_dependency run pkg-config
+Add_dependency run xproto
+Add_dependency run xextproto
+Add_dependency run xineramaproto
+Add_dependency run libX11-devel
+Add_dependency run libXext-devel
+Add_dependency run glibc-devel
 Add_dependency run libXinerama
 
 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
diff --git a/srcpkgs/libXinerama/template b/srcpkgs/libXinerama/template
index efe89542388..1f474c57f86 100644
--- a/srcpkgs/libXinerama/template
+++ b/srcpkgs/libXinerama/template
@@ -1,6 +1,7 @@
 # Template build file for 'libXinerama'.
 pkgname=libXinerama
 version=1.1
+revision=1
 distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
 short_desc="X PanoramiX extension library"
@@ -10,10 +11,13 @@ long_desc="
  libXinerama provides X PanoramiX extension library."
 
 subpackages="$pkgname-devel"
+Add_dependency run libX11
+Add_dependency run libXext
+Add_dependency run glibc
 Add_dependency build pkg-config
 Add_dependency build xproto
 Add_dependency build xextproto
+Add_dependency build glibc-devel
 Add_dependency build xineramaproto
-Add_dependency full glibc
-Add_dependency full libX11
-Add_dependency full libXext
+Add_dependency build libX11-devel
+Add_dependency build libXext-devel