diff --git a/media-gfx/optipng/optipng-0.7.5.recipe b/media-gfx/optipng/optipng-0.7.6.recipe
similarity index 65%
rename from media-gfx/optipng/optipng-0.7.5.recipe
rename to media-gfx/optipng/optipng-0.7.6.recipe
index 5c91616b3..e45401967 100644
--- a/media-gfx/optipng/optipng-0.7.5.recipe
+++ b/media-gfx/optipng/optipng-0.7.6.recipe
@@ -3,40 +3,40 @@ DESCRIPTION="OptiPNG is a PNG optimizer, recompressing PNG files so they \
 become smaller, without losing any information. Additionally, OptiPNG can \
 convert other image formats, such as BMP, GIF, PNM and TIFF, to PNG files."
 HOMEPAGE="http://optipng.sourceforge.net/"
-COPYRIGHT="2001-2014 Cosmin Truta"
+COPYRIGHT="2001-2016 Cosmin Truta"
 LICENSE="Zlib"
 REVISION="1"
 SOURCE_URI="http://downloads.sf.net/optipng/optipng-$portVersion.tar.gz"
-CHECKSUM_SHA256="74e54b798b012dff8993fb8d90185ca83f18cfa4935f4a93b0bcfc33c849619d"
-PATCHES="optipng-$portVersion.patchset"
+CHECKSUM_SHA256="4870631fcbd3825605f00a168b8debf44ea1cda8ef98a73e5411eee97199be80"
 
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 
 PROVIDES="
-	optipng$secondaryArchSuffix = $portVersion
-	cmd:optipng$secondaryArchSuffix = $portVersion
+	optipng = $portVersion
+	cmd:optipng = $portVersion
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix
-	lib:libpng
+	haiku
+	lib:libpng >= 16
 	lib:libz
 	"
 
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
-	devel:libpng
+	devel:libpng >= 16
 	devel:libz
 	"
 BUILD_PREREQUIRES="
 	cmd:ar
-	cmd:gcc$secondaryArchSuffix
+	cmd:gcc
 	cmd:make
 	cmd:ranlib
+	cmd:diff
 	"
 
 BUILD()
 {
-	./configure -bindir=$binDir -mandir=$manDir \
+	LIBM= CFLAGS="-O2 -Wall" ./configure -bindir=$binDir -mandir=$manDir \
 		-with-system-libpng \
 		-with-system-zlib
 	make
@@ -46,3 +46,8 @@ INSTALL()
 {
 	make install
 }
+
+TEST()
+{
+	make check
+}
diff --git a/media-gfx/optipng/patches/optipng-0.7.5.patchset b/media-gfx/optipng/patches/optipng-0.7.5.patchset
deleted file mode 100644
index b45d99218..000000000
--- a/media-gfx/optipng/patches/optipng-0.7.5.patchset
+++ /dev/null
@@ -1,24 +0,0 @@
-From: Chris Roberts <cpr420@gmail.com>
-Date: Mon, 23 Dec 2013 12:13:23 -0700
-Subject: applying patch optipng-0.7.5.patch
-
---- optipng-0.7.5/configure	2014-03-24 10:45:00.000000000 +0000
-+++ optipng-0.7.5-haiku/configure
-@@ -183,7 +183,7 @@ rm -f $test.c $test.o
- if test "$gccish" -ne 0
- then
-     CC="${CC-$cc}"
--    CFLAGS="${CFLAGS--O2 -Wall -Wextra}"
-+    CFLAGS="${CFLAGS--O2 -Wall}"
- else
-     CC="${CC-cc}"
-     CFLAGS="${CFLAGS--O}"
-@@ -397,7 +397,7 @@ sed_config="
-     s|@ARFLAGS@|${ARFLAGS-cru}|g
-     s|@RANLIB@|${RANLIB-ranlib}|g
-     s|@LIBS@|${LIBS-}|g
--    s|@LIBM@|${LIBM--lm}|g
-+    s|@LIBM@|${LIBM-}|g
-     s|@LIBZ@|${LIBZ--lz}|g
-     s|@LIBPNG@|${LIBPNG--lpng}|g
-     s|@DIFF@|${DIFF-diff -b -u}|g