diff --git a/media-libs/libpng/libpng-1.5.26.recipe b/media-libs/libpng/libpng-1.5.27.recipe
similarity index 70%
rename from media-libs/libpng/libpng-1.5.26.recipe
rename to media-libs/libpng/libpng-1.5.27.recipe
index bbbbb9585..40f7edb33 100644
--- a/media-libs/libpng/libpng-1.5.26.recipe
+++ b/media-libs/libpng/libpng-1.5.27.recipe
@@ -1,22 +1,22 @@
 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"
+years."
 HOMEPAGE="http://www.libpng.org/"
-COPYRIGHT="1998-2015 Glenn Randers-Pehrson
+COPYRIGHT="1998-2016 Glenn Randers-Pehrson
 	1996-1997 Andreas Dilger
 	1995-1996 Guy Eric Schalnat, Group 42 Inc."
 LICENSE="LibPNG"
-REVISION="2"
-SOURCE_URI="http://prdownloads.sourceforge.net/libpng/libpng-$portVersion.tar.gz"
-CHECKSUM_SHA256="5bfc3c29c9c5551f6fa39e352121e8d9e3d6eb5093b72a7a9cff0a232962ae51"
+REVISION="1"
+SOURCE_URI="http://downloads.sourceforge.net/libpng/libpng-$portVersion.tar.gz"
+CHECKSUM_SHA256="fa934f6ef7474889d408c66e26260b8dd34a048a239bff72372350425767d44b"
 
 ARCHITECTURES="x86_gcc2 x86 x86_64 ?arm ?ppc"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
 PROVIDES="
 	libpng$secondaryArchSuffix = $portVersion compat >= 1.5
-	lib:libpng15$secondaryArchSuffix = 15.26.0 compat >= 15
+	lib:libpng15$secondaryArchSuffix = 15.27.0 compat >= 15
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -27,8 +27,8 @@ PROVIDES_devel="
 	libpng${secondaryArchSuffix}_devel = $portVersion compat >= 1.5
 	cmd:libpng_config$secondaryArchSuffix = $portVersion compat >= 1.5
 	cmd:libpng15_config$secondaryArchSuffix = $portVersion compat >= 1.5
-	devel:libpng$secondaryArchSuffix = 15.26.0 compat >= 15
-	devel:libpng15$secondaryArchSuffix = 15.26.0 compat >= 15
+	devel:libpng$secondaryArchSuffix = 15.27.0 compat >= 15
+	devel:libpng15$secondaryArchSuffix = 15.27.0 compat >= 15
 	"
 REQUIRES_devel="
 	libpng$secondaryArchSuffix == $portVersion base
@@ -66,9 +66,21 @@ INSTALL()
 	prepareInstalledDevelLibs libpng libpng15
 	fixPkgconfig
 
+	if [ -z "$secondaryArchSuffix" ]; then
+		maybe_manDir_man3=$manDir/man3
+	else
+		maybe_manDir_man3=
+		rm -rf $manDir
+	fi
+
 	# devel package
 	packageEntries devel \
 		$binDir \
 		$developDir \
-		$manDir/man3
+		$maybe_manDir_man3
+}
+
+TEST()
+{
+	make check
 }
diff --git a/media-libs/libpng/libpng16-1.6.21.recipe b/media-libs/libpng/libpng16-1.6.22.recipe
similarity index 79%
rename from media-libs/libpng/libpng16-1.6.21.recipe
rename to media-libs/libpng/libpng16-1.6.22.recipe
index c452879d6..607d8414f 100644
--- a/media-libs/libpng/libpng16-1.6.21.recipe
+++ b/media-libs/libpng/libpng16-1.6.22.recipe
@@ -7,9 +7,9 @@ COPYRIGHT="1998-2016 Glenn Randers-Pehrson
 	1996-1997 Andreas Dilger
 	1995-1996 Guy Eric Schalnat, Group 42, Inc."
 LICENSE="LibPNG"
-REVISION="2"
+REVISION="1"
 SOURCE_URI="http://downloads.sf.net/libpng/libpng-$portVersion.tar.gz"
-CHECKSUM_SHA256="b36a3c124622c8e1647f360424371394284f4c6c4b384593e478666c59ff42d3"
+CHECKSUM_SHA256="7944056621477eca2eba31cf1e99fa484721216a8af03c124426fccb37665df9"
 SOURCE_DIR="libpng-$portVersion"
 
 ARCHITECTURES="x86_gcc2 x86 x86_64 arm ?ppc"
@@ -17,7 +17,7 @@ SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
 PROVIDES="
 	libpng16$secondaryArchSuffix = $portVersion compat >= 1.6
-	lib:libpng16$secondaryArchSuffix = 16.21.0 compat >= 16
+	lib:libpng16$secondaryArchSuffix = 16.22.0 compat >= 16
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -30,8 +30,8 @@ PROVIDES_devel="
 	cmd:libpng16_config$secondaryArchSuffix = $portVersion compat >= 1.6
 	cmd:pngfix$secondaryArchSuffix = $portVersion compat >= 1.6
 	cmd:png_fix_itxt$secondaryArchSuffix = $portVersion compat >= 1.6
-	devel:libpng$secondaryArchSuffix = 16.21.0 compat >= 16
-	devel:libpng16$secondaryArchSuffix = 16.21.0 compat >= 16
+	devel:libpng$secondaryArchSuffix = 16.22.0 compat >= 16
+	devel:libpng16$secondaryArchSuffix = 16.22.0 compat >= 16
 	"
 REQUIRES_devel="
 	libpng16$secondaryArchSuffix == $portVersion base
@@ -70,9 +70,21 @@ INSTALL()
 	prepareInstalledDevelLibs libpng libpng16
 	fixPkgconfig
 
+	if [ -z "$secondaryArchSuffix" ]; then
+		maybe_manDir_man3=$manDir/man3
+	else
+		maybe_manDir_man3=
+		rm -rf $manDir
+	fi
+
 	# devel package
 	packageEntries devel \
 		$binDir \
 		$developDir \
-		$manDir/man3
+		$maybe_manDir_man3
+}
+
+TEST()
+{
+	make check
 }