diff --git a/media-libs/libpng/libpng-1.5.12.recipe b/media-libs/libpng/libpng-1.5.12.recipe
index ea6a3db26..3364959f7 100644
--- a/media-libs/libpng/libpng-1.5.12.recipe
+++ b/media-libs/libpng/libpng-1.5.12.recipe
@@ -1,27 +1,77 @@
-DESCRIPTION="libpng" 
-HOMEPAGE="http://www.libpng.org" 
-COPYRIGHT="1998-2011 Glenn Randers-Pehrson
-		1996-1997 Andreas Dilger
-		1995-1996 Guy Eric Schalnat, Group 42, Inc."
+SUMMARY="Portable Network Graphics library"
+DESCRIPTION="libpng is the official PNG reference library. It supports almost all PNG features, is extensible, and has been extensively tested for over 17 years."
+HOMEPAGE="http://www.libpng.org"
+COPYRIGHT="
+	1998-2011 Glenn Randers-Pehrson
+	1996-1997 Andreas Dilger
+	1995-1996 Guy Eric Schalnat, Group 42, Inc.
+	"
 LICENSE="LibPNG"
-
 SRC_URI="http://prdownloads.sourceforge.net/libpng/libpng-1.5.12.tar.gz?download"
 CHECKSUM_MD5="8ea7f60347a306c5faf70b977fa80e28"
 REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND=""
+ARCHITECTURES="x86_gcc2 ?x86"
+
+PATCHES="libpng-1.5.12.patchset"
+
+PROVIDES="
+	libpng = $portVersion compat >= 1.5
+	lib:libpng = 15.12.0 compat >= 15
+	lib:libpng15 = 15.12.0 compat >= 15
+	"
+REQUIRES="
+	haiku >= $haikuVersion
+	lib:libz
+	"
+BUILD_REQUIRES="
+	cmd:aclocal
+	cmd:autoconf
+	cmd:automake
+	cmd:gcc
+	cmd:ld
+	cmd:libtoolize
+	cmd:make
+	devel:libz >= 1.0.4
+	"
+BUILD_PREREQUIRES="
+	haiku_devel >= $haikuVersion
+	"
+
+SOURCE_DIR="$portVersionedName"
+
 BUILD()
 {
-	cd libpng-1.5.12
-	libtoolize --force --copy
+	aclocal
+	libtoolize --force --copy --install
 	./autogen.sh
-	./configure --prefix=`finddir B_COMMON_DIRECTORY` \
-		--mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man
-	make
+	runConfigure ./configure
+	make $jobArgs
 }
 
 INSTALL()
 {
-	cd libpng-1.5.12
 	make install
+
+	prepareInstalledDevelLibs libpng
+	fixPkgconfig
+
+	# devel package
+	packageEntries devel \
+		$binDir \
+		$developDir \
+		$manDir/man3
 }
+
+# ----- devel package -------------------------------------------------------
+
+SUMMARY_devel="The libpng development files"
+PROVIDES_devel="
+	libpng_devel = $portVersion compat >= 1.5
+	cmd:libpng_config = $portVersion compat >= 1.5
+	cmd:libpng15_config = $portVersion compat >= 1.5
+	devel:libpng = 15.12.0 compat >= 15
+	devel:libpng15 = 15.12.0 compat >= 15
+	"
+REQUIRES_devel="
+	libpng == $portVersion base
+	"
diff --git a/media-libs/libpng/patches/libpng-1.5.12.patchset b/media-libs/libpng/patches/libpng-1.5.12.patchset
new file mode 100644
index 000000000..9d93644d2
--- /dev/null
+++ b/media-libs/libpng/patches/libpng-1.5.12.patchset
@@ -0,0 +1,22 @@
+From ca47ea510b8f381f4cd3f0dbf887faa0b95257ca Mon Sep 17 00:00:00 2001
+From: Ingo Weinhold <ingo_weinhold@gmx.de>
+Date: Mon, 10 Jun 2013 23:42:11 +0200
+Subject: configure.ac: replace obsolete AM_CONFIG_HEADER
+
+
+diff --git a/configure.ac b/configure.ac
+index beeeb81..8f51ada 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -31,7 +31,7 @@ PNGLIB_RELEASE=12
+ dnl End of version number stuff
+ 
+ AC_CONFIG_SRCDIR([pngget.c])
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS(config.h)
+ 
+ # Checks for programs.
+ AC_LANG([C])
+-- 
+1.7.5
+