diff --git a/srcpkgs/cairo/cairo-devel.template b/srcpkgs/cairo/cairo-devel.template
index 57ec2bbe6e..6f4024b5dd 100644
--- a/srcpkgs/cairo/cairo-devel.template
+++ b/srcpkgs/cairo/cairo-devel.template
@@ -1,12 +1,11 @@
 # Template file for 'cairo-devel'.
 #
-depends="freetype-devel fontconfig-devel glib-devel libpng-devel libxcb-devel libX11-devel libXrender-devel pixman-devel MesaLib-devel cairo>=1.12.2"
+depends="fontconfig-devel glib-devel libpng-devel>=1.5.10 libXrender-devel pixman-devel MesaLib-devel cairo>=$version"
 short_desc="${sourcepkg} - 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 usr
diff --git a/srcpkgs/cairo/cairo.rshlibs b/srcpkgs/cairo/cairo.rshlibs
index e832444d2b..07e5ba7079 100644
--- a/srcpkgs/cairo/cairo.rshlibs
+++ b/srcpkgs/cairo/cairo.rshlibs
@@ -3,7 +3,6 @@ libpixman-1.so.0
 libfontconfig.so.1
 libfreetype.so.6
 libEGL.so.1
-libpng14.so.14
 libxcb-shm.so.0
 libxcb-render.so.0
 libxcb.so.1
@@ -17,3 +16,4 @@ libglib-2.0.so.0
 libm.so.6
 libc.so.6
 libdl.so.2
+libpng15.so.15
diff --git a/srcpkgs/cairo/template b/srcpkgs/cairo/template
index 26a8ae7dac..cb3ee49751 100644
--- a/srcpkgs/cairo/template
+++ b/srcpkgs/cairo/template
@@ -1,15 +1,16 @@
 # Template build file for 'cairo'.
 pkgname=cairo
 version=1.12.2
-homepage="http://cairographics.org"
-distfiles="${homepage}/releases/$pkgname-$version.tar.xz"
+revision=2
 build_style=gnu-configure
 configure_args="--enable-tee --enable-gl"
-makedepends="pkg-config zlib-devel fontconfig-devel freetype-devel pixman-devel libpng-devel libxcb-devel libX11-devel libXrender-devel glib-devel MesaLib-devel"
-revision=1
+makedepends="pkg-config libpng-devel>=1.5.10 fontconfig-devel pixman-devel libXrender-devel glib-devel MesaLib-devel"
+subpackages="$pkgname-devel"
 short_desc="Vector graphics library with cross-device output support"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="LGPL-2.1, MPL-1.1"
+homepage="http://cairographics.org"
+distfiles="${homepage}/releases/$pkgname-$version.tar.xz"
 checksum=b786bc4a70542bcb09f2d9d13e5e6a0c86408cbf6d1edde5f0de807eecf93f96
 long_desc="
  Cairo is a vector graphics library with cross-device output support. Currently
@@ -22,6 +23,3 @@ long_desc="
  1.4 imaging model. Cairo provides operations including stroking and filling
  Bezier cubic splines, transforming and compositing translucent images, and
  antialiased text rendering."
-
-subpackages="$pkgname-devel"
-