diff --git a/srcpkgs/libXaw/libXaw-devel.template b/srcpkgs/libXaw/libXaw-devel.template
index 593dd31c4bb..fcc700f44d0 100644
--- a/srcpkgs/libXaw/libXaw-devel.template
+++ b/srcpkgs/libXaw/libXaw-devel.template
@@ -1,17 +1,14 @@
 # Template file for 'libXaw-devel'.
 #
-depends="pkg-config xproto xextproto libICE-devel libSM-devel libX11-devel libXext-devel libXt-devel libXmu-devel libXpm-devel libXaw"
+depends="xproto libXext-devel libXt-devel libXmu-devel libXpm-devel libXaw-$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/libXaw/template b/srcpkgs/libXaw/template
index 8b5dcf50f38..4f88b43d513 100644
--- a/srcpkgs/libXaw/template
+++ b/srcpkgs/libXaw/template
@@ -1,18 +1,14 @@
 # Template build file for 'libXaw'.
 pkgname=libXaw
-version=1.0.9
+version=1.0.11
 distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
 configure_args="--without-xmlto"
-revision=3
-makedepends="pkg-config xproto xextproto libICE-devel libSM-devel libX11-devel libXext-devel libXt-devel libXmu-devel libXpm-devel"
+subpackages="$pkgname-devel"
+makedepends="pkg-config libXext-devel libXt-devel libXmu-devel libXpm-devel"
 short_desc="X Athena Widgets Library from modular Xorg X11"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=a83977546b78e24ac5dca86affc10b6404a87c16272405b05386feca1a2db037
+checksum=87a874acbb71d1ee59b8047312fc91d89dcb373e2970f121184cdae29a3d9492
 long_desc="
  Xaw is the X Athena Widget Set. Xaw is a widget set based on the
- X Toolkit Intrinsics (Xt) Library.
-
- This libXaw is from the modular Xorg X11."
-
-subpackages="$pkgname-devel"
+ X Toolkit Intrinsics (Xt) Library."