diff --git a/srcpkgs/libwmf/libwmf-devel.template b/srcpkgs/libwmf/libwmf-devel.template
index 0953c19084..bafe1cfdb5 100644
--- a/srcpkgs/libwmf/libwmf-devel.template
+++ b/srcpkgs/libwmf/libwmf-devel.template
@@ -1,23 +1,15 @@
 # Template file for 'libwmf-devel'.
 #
-depends="pkg-config freetype-devel jpeg-devel libpng-devel expat-devel glib-devel gtk+-devel gd-devel libX11-devel zlib-devel libwmf"
+depends="libwmf>=$version"
 short_desc="${sourcepkg} development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-
-
-do_install()
-{
-	local gtk_abiver="2.10.0"
-
-	mkdir -p ${DESTDIR}/usr/lib/gtk-2.0/${gtk_abiver}/loaders
-	mkdir -p  ${DESTDIR}/usr/bin ${DESTDIR}/usr/share
-	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
-	mv ${SRCPKGDESTDIR}/usr/lib/lib*.*a ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/share/doc ${DESTDIR}/usr/share
-	mv ${SRCPKGDESTDIR}/usr/bin/libwmf-config ${DESTDIR}/usr/bin
-	mv ${SRCPKGDESTDIR}/usr/lib/gtk-2.0/${gtk_abiver}/loaders/*.*a \
-		${DESTDIR}/usr/lib/gtk-2.0/${gtk_abiver}/loaders
+do_install() {
+	vmove usr/include usr
+	vmove "usr/lib/*.a" usr/lib
+	vmove usr/share/doc usr/share
+	vmove usr/bin/libwmf-config usr/bin
+	vmove "usr/lib/gtk-2.0/2.10.0/loaders/*.a" usr/lib/gtk-2.0/2.10.0/loaders
 }
diff --git a/srcpkgs/libwmf/libwmf.rshlibs b/srcpkgs/libwmf/libwmf.rshlibs
index 53cf5c6b57..6140466db0 100644
--- a/srcpkgs/libwmf/libwmf.rshlibs
+++ b/srcpkgs/libwmf/libwmf.rshlibs
@@ -7,7 +7,7 @@ libfreetype.so.6
 libbz2.so.1
 libexpat.so.1
 libjpeg.so.8
-libpng14.so.14
 libgdk_pixbuf-2.0.so.0
 libgobject-2.0.so.0
 libglib-2.0.so.0
+libpng15.so.15
diff --git a/srcpkgs/libwmf/template b/srcpkgs/libwmf/template
index 752eaf7415..cbe09f7fc7 100644
--- a/srcpkgs/libwmf/template
+++ b/srcpkgs/libwmf/template
@@ -1,15 +1,16 @@
 # Template build file for 'libwmf'.
 pkgname=libwmf
 version=0.2.8.4
-revision=10
+revision=11
 distfiles="${SOURCEFORGE_SITE}/wvware/$pkgname-$version.tar.gz"
 build_style=gnu-configure
 configure_args="--with-gsfontdir=/usr/share/fonts/Type1
- --with-fontdir=/usr/share/fonts/Type1
- --with-gsfontmap=/usr/share/ghostscript/8.15/lib/Fontmap.GS"
-depends="gd"
-makedepends="pkg-config freetype-devel jpeg-devel libpng-devel expat-devel glib-devel gtk+-devel gd-devel libX11-devel zlib-devel"
+--with-fontdir=/usr/share/fonts/Type1
+--with-gsfontmap=/usr/share/ghostscript/8.15/lib/Fontmap.GS"
+makedepends="pkg-config freetype-devel jpeg-devel libpng-devel>=1.5.10 expat-devel glib-devel gtk+-devel gd-devel"
 fulldepends="gsfonts"
+triggers="gtk-pixbuf-loaders"
+subpackages="$pkgname-devel"
 short_desc="Library for reading and converting WMF (Windows Meta Files)"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=5b345c69220545d003ad52bfd035d5d6f4f075e65204114a9e875e84895a7cf8
@@ -23,11 +24,6 @@ long_desc="
  binding might render text in a different font than would appear under
  MS Windows natively (this is a runtime issue for the wmf2x program)."
 
-triggers="gtk-pixbuf-loaders"
-subpackages="$pkgname-devel"
-
-
-post_install()
-{
+post_install() {
 	rm -rf ${DESTDIR}/usr/share/fonts
 }