diff --git a/graphics/png2ico/Makefile b/graphics/png2ico/Makefile
index 22bf2cfc2f37..b0a3af104d14 100644
--- a/graphics/png2ico/Makefile
+++ b/graphics/png2ico/Makefile
@@ -20,6 +20,10 @@ MAN1=		png2ico.1
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 USE_GMAKE=	yes
+USE_REINPLACE=	yes
+
+post-patch:
+	${REINPLACE_CMD} -e 's|-O2|${CFLAGS}|' ${WRKSRC}/Makefile
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
diff --git a/graphics/png2ico/files/patch-Makefile b/graphics/png2ico/files/patch-Makefile
index d0ae605dbfec..39b52e7ebe66 100644
--- a/graphics/png2ico/files/patch-Makefile
+++ b/graphics/png2ico/files/patch-Makefile
@@ -1,8 +1,11 @@
---- Makefile.orig	Sun Dec  8 14:50:10 2002
-+++ Makefile	Sun Dec  8 14:50:17 2002
-@@ -1,4 +1,4 @@
+--- Makefile.orig	Sat Dec  7 23:49:52 2002
++++ Makefile	Tue Apr 15 02:32:25 2003
+@@ -1,6 +1,6 @@
 -CPPFLAGS=-W -Wall -O2 -finline-functions
 +CPPFLAGS=-W -Wall -O2 -finline-functions -I/usr/local/include -L/usr/local/lib
  #CPPFLAGS=-O0 -W -Wall
- DEBUG=-g
+-DEBUG=-g
++#DEBUG=-g
+ 
+ all: png2ico