diff --git a/srcpkgs/ghostscript/ghostscript-devel.template b/srcpkgs/ghostscript/ghostscript-devel.template
index 3346dfe440..3c1f37d3f3 100644
--- a/srcpkgs/ghostscript/ghostscript-devel.template
+++ b/srcpkgs/ghostscript/ghostscript-devel.template
@@ -1,12 +1,12 @@
 # Template file for 'ghostscript-devel'.
 #
-depends="libijs>=9.05 libgs>=9.05"
+noarch=yes
+depends="libijs>=$version libgs>=$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/lib/pkgconfig usr/lib
diff --git a/srcpkgs/ghostscript/ghostscript.rshlibs b/srcpkgs/ghostscript/ghostscript.rshlibs
index cfb3e9be0a..119f7df77f 100644
--- a/srcpkgs/ghostscript/ghostscript.rshlibs
+++ b/srcpkgs/ghostscript/ghostscript.rshlibs
@@ -5,7 +5,6 @@ libcupsimage.so.2
 libcups.so.2
 libpthread.so.0
 libm.so.6
-libpng14.so.14
 libz.so.1
 libdl.so.2
 libfontconfig.so.1
@@ -15,3 +14,4 @@ libXt.so.6
 libX11.so.6
 libijs-0.35.so
 libgs.so.9
+libpng15.so.15
diff --git a/srcpkgs/ghostscript/libgs.rshlibs b/srcpkgs/ghostscript/libgs.rshlibs
index 09052d3624..0624b2df4c 100644
--- a/srcpkgs/ghostscript/libgs.rshlibs
+++ b/srcpkgs/ghostscript/libgs.rshlibs
@@ -5,9 +5,9 @@ libcupsimage.so.2
 libcups.so.2
 libpthread.so.0
 libm.so.6
-libpng14.so.14
 libz.so.1
 libdl.so.2
 libfontconfig.so.1
 libfreetype.so.6
 libc.so.6
+libpng15.so.15
diff --git a/srcpkgs/ghostscript/template b/srcpkgs/ghostscript/template
index 479cfcec52..267f3981c9 100644
--- a/srcpkgs/ghostscript/template
+++ b/srcpkgs/ghostscript/template
@@ -1,9 +1,9 @@
 # Template file for 'ghostscript'
 pkgname=ghostscript
 version=9.05
+revision=2
 distfiles="http://downloads.ghostscript.com/public/$pkgname-$version.tar.bz2"
-makedepends="automake pkg-config libXext-devel libXt-devel cups-devel fontconfig-devel jasper-devel tiff-devel jpeg-devel libpng-devel lcms-devel lcms2-devel"
-revision=1
+makedepends="automake pkg-config libXext-devel libXt-devel fontconfig-devel jasper-devel tiff-devel jpeg-devel libpng-devel>=1.5.10 lcms2-devel cups-devel"
 short_desc="An interpreter for the PostScript language"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.ghostscript.com/"
@@ -15,7 +15,6 @@ long_desc="
 disable_parallel_build=yes
 subpackages="libgs libijs $pkgname-devel"
 
-
 pre_configure() {
 	# force it to use system libs.
 	rm -rf jpeg libpng zlib jasper expat tiff lcms lcms2 freetype
@@ -38,7 +37,7 @@ do_configure() {
 
 do_build() {
 	# build ghostscript
-	make ${makejobs}
+	make ${makejobs} && make ${makejobs} so
 	# build libijs
 	cd ijs && make ${makejobs}
 }