diff --git a/srcpkgs/WindowMaker/template b/srcpkgs/WindowMaker/template
index fa9fb39c9f1..34d896eb0ff 100644
--- a/srcpkgs/WindowMaker/template
+++ b/srcpkgs/WindowMaker/template
@@ -1,13 +1,13 @@
 # Template file for 'WindowMaker'
 pkgname=WindowMaker
 version=0.95.4
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--enable-xinerama --with-nlsdir=/usr/share/locale
  --with-gnustepdir=/usr/lib/GNUstep --enable-usermenu --enable-modelock
  --enable-xrandr --disable-static"
 makedepends="pkg-config libXinerama-devel libXrandr-devel
- libXmu-devel libpng-devel libXpm-devel libXft-devel tiff-devel
+ libXmu-devel libpng-devel>=1.6 libXpm-devel libXft-devel tiff-devel
  giflib-devel fontconfig-devel"
 short_desc="An X11 window manager with a NEXTSTEP look and feel"
 maintainer="Juan RP <xtraeme@gmail.com>"
@@ -23,7 +23,7 @@ post_install() {
 
 WindowMaker-devel_package() {
 	depends="${sourcepkg}>=${version}"
-	short_desc="${short_desc} -- development files"
+	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
@@ -39,7 +39,6 @@ WindowMaker_package() {
 		/etc/WindowMaker/WMState
 		/etc/WindowMaker/WMGLOBA"
 	pkg_install() {
-		vmove etc
-		vmove usr
+		vmove all
 	}
 }