diff --git a/srcpkgs/wv/libwv.rshlibs b/srcpkgs/wv/libwv.rshlibs
index 16017c1cac0..f73959d9569 100644
--- a/srcpkgs/wv/libwv.rshlibs
+++ b/srcpkgs/wv/libwv.rshlibs
@@ -2,7 +2,7 @@ libgsf-1.so.114
 libgobject-2.0.so.0
 libxml2.so.2
 libglib-2.0.so.0
-libpng14.so.14
 libz.so.1
 libm.so.6
 libc.so.6
+libpng15.so.15
diff --git a/srcpkgs/wv/libwv.template b/srcpkgs/wv/libwv.template
index 3b218804fa6..11a2cf11921 100644
--- a/srcpkgs/wv/libwv.template
+++ b/srcpkgs/wv/libwv.template
@@ -5,7 +5,6 @@ long_desc="${long_desc}
 
  This package contains the runtime."
 
-do_install()
-{
+do_install() {
 	vmove "usr/lib/*.so*" usr/lib
 }
diff --git a/srcpkgs/wv/template b/srcpkgs/wv/template
index 157754b42e1..fe0f12276f0 100644
--- a/srcpkgs/wv/template
+++ b/srcpkgs/wv/template
@@ -1,20 +1,18 @@
 # Template file for 'wv'
 pkgname=wv
 version=1.2.4
-distfiles="${SOURCEFORGE_SITE}/${pkgname}ware/${pkgname}-$version.tar.gz"
 build_style=gnu-configure
-revision=3
-makedepends="libgsf-devel glib-devel libxml2-devel libpng-devel zlib-devel pkg-config"
+revision=4
+makedepends="pkg-config glib-devel libxml2-devel libpng-devel>=1.5.10 libgsf-devel"
+subpackages="libwv wv-devel"
 short_desc="wv is a library which allows access to Microsoft Word files."
 homepage="http://wvware.sourceforge.net/"
 license="GPL-3"
 maintainer="davehome <davehome@redthumb.info.tm>"
+distfiles="${SOURCEFORGE_SITE}/${pkgname}ware/${pkgname}-$version.tar.gz"
 checksum=673109910e22d4cf94cc8be4dcb9a0c41b5fbdb1736d4b7bdc7778894d57c2d6
 long_desc="
  wv is a library which allows access to Microsoft Word files. It can load and
  parse Word 2000, 97, 95 and 6 file formats. (These are the file formats
  known internally as Word 9, 8, 7 and 6.) There is some support for reading
  earlier formats as well: Word 2 docs are converted to plaintext."
-
-subpackages="lib$pkgname $pkgname-devel"
-
diff --git a/srcpkgs/wv/wv-devel.template b/srcpkgs/wv/wv-devel.template
index 6abfcd9fe8b..3e4926c82b6 100644
--- a/srcpkgs/wv/wv-devel.template
+++ b/srcpkgs/wv/wv-devel.template
@@ -1,16 +1,13 @@
 # Template file for 'wv-devel'.
 #
-depends="glibc-devel libwv"
+depends="glibc-devel libwv>=$version"
 short_desc="${short_desc} - Development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-
-do_install()
-{
+do_install() {
         vmove usr/include usr
         vmove "usr/lib/*.a" usr/lib
         vmove usr/lib/pkgconfig usr/lib
 }
-