diff --git a/srcpkgs/wxGTK/template b/srcpkgs/wxGTK/template
index fe1c2e12b4..3d47119641 100644
--- a/srcpkgs/wxGTK/template
+++ b/srcpkgs/wxGTK/template
@@ -1,14 +1,16 @@
 # Template build file for 'wxGTK'
 pkgname=wxGTK
 version=2.8.12.1
-distfiles="${SOURCEFORGE_SITE}/wxpython/wxPython-src-${version}.tar.bz2"
+revision=2
 wrksrc="wxPython-src-${version}"
-makedepends="pkg-config zlib-devel libpng-devel jpeg-devel libXpm-devel tiff-devel expat-devel libX11-devel libXinerama-devel GConf-devel cairo-devel gtk+-devel MesaLib-devel"
-revision=1
+subpackages="${pkgname}-devel"
+# XXX: GStreamer support?
+makedepends="pkg-config zlib-devel libpng-devel>=1.5.10 jpeg-devel libXpm-devel tiff-devel expat-devel libXinerama-devel GConf-devel gtk+-devel MesaLib-devel"
 short_desc="The wxWidgets GUI toolkit library (GTK Version)"
 maintainer="davehome <davehome@redthumb.info.tm>"
 homepage="http://www.wxwidgets.org/"
 license="wxWindows"
+distfiles="${SOURCEFORGE_SITE}/wxpython/wxPython-src-${version}.tar.bz2"
 checksum=1f3f153d9f1504c6ce2d2c4b23e940b8f58b81f4cba35cda1a5bb31142243cd0
 long_desc="
  C++ library that lets developers create applications for Windows, OS X, Linux
@@ -20,10 +22,6 @@ long_desc="
  native look and feel because it uses the platform's native API rather than
  emulating the GUI. It's also extensive, free, open-source and mature."
 
-subpackages="${pkgname}-devel"
-
-# XXX: GStreamer support?
-
 do_configure() {
 	./configure --prefix=/usr --enable-monolithic --with-gtk=2 --with-x \
 		--with-opengl --enable-unicode --enable-graphics_ctx \
diff --git a/srcpkgs/wxGTK/wxGTK-devel.template b/srcpkgs/wxGTK/wxGTK-devel.template
index c340694a56..bb90e79bed 100644
--- a/srcpkgs/wxGTK/wxGTK-devel.template
+++ b/srcpkgs/wxGTK/wxGTK-devel.template
@@ -1,11 +1,11 @@
 # Template file for 'wxGTK-devel'.
 #
+depends="wxGTK>=$version"
 short_desc="${short_desc} (development files)"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-
 do_install() {
 	vmove usr/include usr
 	vmove usr/share/aclocal usr/share
diff --git a/srcpkgs/wxGTK/wxGTK.rshlibs b/srcpkgs/wxGTK/wxGTK.rshlibs
index 102a153f38..fa9175a371 100644
--- a/srcpkgs/wxGTK/wxGTK.rshlibs
+++ b/srcpkgs/wxGTK/wxGTK.rshlibs
@@ -9,7 +9,6 @@ libglib-2.0.so.0
 libXinerama.so.1
 libXxf86vm.so.1
 libSM.so.6
-libpng14.so.14
 libjpeg.so.8
 libtiff.so.5
 libexpat.so.1
@@ -19,3 +18,4 @@ libgcc_s.so.1
 libpthread.so.0
 libc.so.6
 libGL.so.1
+libpng15.so.15