diff --git a/media-libs/glpng/glpng-1.46.recipe b/media-libs/glpng/glpng-1.46.recipe
index fa4270081..b184501d7 100644
--- a/media-libs/glpng/glpng-1.46.recipe
+++ b/media-libs/glpng/glpng-1.46.recipe
@@ -6,57 +6,64 @@ using modified versions of the LibPNG 1.0.2 and ZLib 1.1.3 libraries."
 HOMEPAGE="http://www.fifi.org/doc/libglpng-dev/glpng.html"
 COPYRIGHT="1999-2014 Ben Wyatt"
 LICENSE="Zlib"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="ftp://ftp.mirrorservice.org/sites/distfiles.gentoo.org/distfiles/glpng-1.46.tar.gz"
 CHECKSUM_SHA256="4a3e489deca733524780470c4fb89806e354515b541efb58d44f2e11936dc39e"
 SOURCE_DIR="glpng"
 
 ARCHITECTURES="all"
+SECONDARY_ARCHITECTURES="x86"
+
+libVersion="$portVersion"
+libVersionCompat="$libVersion compat >= ${libVersion%.*}"
 
 PROVIDES="
-	glpng = $portVersion
-	lib:libglpng = 1.46 compat >= 1
+	glpng$secondaryArchSuffix = $portVersion
+	lib:libglpng$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES="
-	haiku
-	lib:libGL
-	lib:libpng16
+	haiku$secondaryArchSuffix
+	lib:libGL$secondaryArchSuffix
+	lib:libpng16$secondaryArchSuffix
+	lib:libz$secondaryArchSuffix
 	"
 
 PROVIDES_devel="
-	glpng_devel
-	devel:libglpng = 1.46 compat >= 1
+	glpng${secondaryArchSuffix}_devel
+	devel:libglpng$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES_devel="
-	glpng == $portVersion base
+	glpng$secondaryArchSuffix == $portVersion base
 	"
 
 BUILD_REQUIRES="
-	haiku_devel
-	devel:libGL
-	devel:libpng16
+	haiku${secondaryArchSuffix}_devel
+	devel:libGL$secondaryArchSuffix
+	devel:libpng16$secondaryArchSuffix
+	devel:libz$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
-	cmd:gcc
+	cmd:cmake
+	cmd:gcc$secondaryArchSuffix
 	cmd:make
 	"
 
 BUILD()
 {
-	make DESTDIR=$prefix DOCDIR=$docDir
+	cmake -Bbuild -S. -DCMAKE_BUILD_TYPE=Release \
+		$cmakeDirArgs \
+		-DBUILD_STATIC_LIBS=OFF
+	make -C build $jobArgs
 }
 
 INSTALL()
 {
-	mkdir -p $includeDir
-
-	make install DESTDIR=$prefix DOCDIR=$docDir
-
-	mv $prefix/include/* $includeDir
-	rm -r $prefix/include
+	make -C build install
 
 	prepareInstalledDevelLib libglpng
 
 	packageEntries devel \
-		$developDir
+		$developDir \
+		$dataDir \
+		$documentationDir
 }