diff --git a/media-libs/libpng/libpng-1.5.12.recipe b/media-libs/libpng/libpng-1.5.12.recipe
index ed4d6a625..cbade86cb 100644
--- a/media-libs/libpng/libpng-1.5.12.recipe
+++ b/media-libs/libpng/libpng-1.5.12.recipe
@@ -9,36 +9,35 @@ COPYRIGHT="
 LICENSE="LibPNG"
 SRC_URI="http://prdownloads.sourceforge.net/libpng/libpng-1.5.12.tar.gz?download"
 CHECKSUM_MD5="8ea7f60347a306c5faf70b977fa80e28"
-REVISION="2"
-ARCHITECTURES="x86_gcc2 ?x86"
+REVISION="3"
+ARCHITECTURES="x86_gcc2 x86"
+SECONDARY_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
+	libpng$secondaryArchSuffix = $portVersion compat >= 1.5
+	lib:libpng$secondaryArchSuffix = 15.12.0 compat >= 15
+	lib:libpng15$secondaryArchSuffix = 15.12.0 compat >= 15
 	"
 REQUIRES="
-	haiku >= $haikuVersion
-	lib:libz
+	haiku$secondaryArchSuffix >= $haikuVersion
+	lib:libz$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
-	devel:libz >= 1.0.4
+	devel:libz$secondaryArchSuffix >= 1.0.4
 	"
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
 	cmd:aclocal
 	cmd:autoconf
 	cmd:automake
-	cmd:gcc
-	cmd:ld
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
 	cmd:libtoolize
 	cmd:make
 	"
 
-SOURCE_DIR="$portVersionedName"
-
 BUILD()
 {
 	aclocal
@@ -64,14 +63,13 @@ INSTALL()
 
 # ----- 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
+	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.12.0 compat >= 15
+	devel:libpng15$secondaryArchSuffix = 15.12.0 compat >= 15
 	"
 REQUIRES_devel="
-	libpng == $portVersion base
+	libpng$secondaryArchSuffix == $portVersion base
 	"