diff --git a/srcpkgs/gegl/gegl-devel.template b/srcpkgs/gegl/gegl-devel.template
index 9808cf01c9d..1a6f1673638 100644
--- a/srcpkgs/gegl/gegl-devel.template
+++ b/srcpkgs/gegl/gegl-devel.template
@@ -1,14 +1,12 @@
 # Template file for 'gegl-devel'.
 #
-depends="glib-devel gegl>=0.2.0"
+noarch=yes
+depends="glib-devel gegl>=$version"
 short_desc="${short_desc} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-
-noarch=yes
-
 do_install() {
 	vmove usr/include usr
 	vmove usr/lib/pkgconfig usr/lib
diff --git a/srcpkgs/gegl/gegl.rshlibs b/srcpkgs/gegl/gegl.rshlibs
index fa07d791a0d..9e410e9fddb 100644
--- a/srcpkgs/gegl/gegl.rshlibs
+++ b/srcpkgs/gegl/gegl.rshlibs
@@ -11,8 +11,8 @@ libc.so.6
 libpangocairo-1.0.so.0
 libpango-1.0.so.0
 libcairo.so.2
-libpng14.so.14
 libjpeg.so.8
 librsvg-2.so.2
 libgdk_pixbuf-2.0.so.0
 libjasper.so.1
+libpng15.so.15
diff --git a/srcpkgs/gegl/template b/srcpkgs/gegl/template
index d9e6e0941bd..d972a800509 100644
--- a/srcpkgs/gegl/template
+++ b/srcpkgs/gegl/template
@@ -1,17 +1,18 @@
 # Template build file for 'gegl'.
 pkgname=gegl
 version=0.2.0
-homepage="http://www.gimp.org"
-distfiles="ftp://ftp.gimp.org/pub/gegl/0.2/gegl-$version.tar.bz2"
+revision=2
 build_style=gnu-configure
 configure_args="--disable-docs --without-sdl --without-libopenraw
 --without-libavformat --without-graphviz --without-lua --without-libspiro
 --without-umfpack --with-exiv2 --without-libv4l --disable-introspection"
-makedepends="pkg-config intltool glib-devel cairo-devel libpng-devel jpeg-devel librsvg-devel pango-devel gtk+-devel babl-devel jasper-devel exiv2-devel"
-revision=1
+makedepends="pkg-config intltool glib-devel libpng-devel>=1.5.10 jpeg-devel cairo-devel librsvg-devel pango-devel gtk+-devel babl-devel jasper-devel exiv2-devel"
+subpackages="gegl-devel"
 short_desc="Graph based image processing framework"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-3, LGPL-3"
+homepage="http://www.gimp.org"
+distfiles="ftp://ftp.gimp.org/pub/gegl/0.2/gegl-$version.tar.bz2"
 checksum=df2e6a0d9499afcbc4f9029c18d9d1e0dd5e8710a75e17c9b1d9a6480dd8d426
 long_desc="
  GEGL (Generic Graphics Library) is a graph based image processing
@@ -21,6 +22,3 @@ long_desc="
  image editing on larger than RAM buffers. Through babl it provides
  support for a wide range of color models and pixel storage formats for
  input and output."
-
-subpackages="gegl-devel"
-