diff --git a/games/corewars/Makefile b/games/corewars/Makefile
index 74ea196491d4..70be1e7365c4 100644
--- a/games/corewars/Makefile
+++ b/games/corewars/Makefile
@@ -1,35 +1,36 @@
 # New ports collection makefile for:	corewars
 # Version required:		0.9.2
 # Date created:			29 February 2000
 # Whom:				Jim Mock <jim@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
 DISTNAME=	corewars-0.9.2
 CATEGORIES=	games
 MASTER_SITES=	http://download.sourceforge.net/corewars/
 
 MAINTAINER=	jim@FreeBSD.org
 
 LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
 
 GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
 GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
 
 USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
 
 CONFIGURE_ENV=	GTK_CONFIG="${GTK_CONFIG}" \
 		GLIB_CONFIG="${GLIB_CONFIG}"
+MAKE_ENV=	FREEBSD_CFLAGS="${CFLAGS}"
 
 post-install:
 	@strip ${PREFIX}/bin/corewars
 .if !defined(NOPORTDOCS)
 	@${ECHO} "===>   Installing README in ${PREFIX}/share/doc/corewars."
 	@${ECHO} "===>   Please read it before playing."
 	@${MKDIR} ${PREFIX}/share/doc/corewars && ${CHMOD} a+rx ${PREFIX}/share/doc/corewars
 	@${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/corewars
 .endif
 
 .include <bsd.port.mk>
diff --git a/games/corewars/files/patch-aa b/games/corewars/files/patch-aa
index 4dd6d4da56a9..a0b661a443a8 100644
--- a/games/corewars/files/patch-aa
+++ b/games/corewars/files/patch-aa
@@ -1,11 +1,20 @@
---- src/Makefile.in.orig	Sat Mar  4 18:12:42 2000
-+++ src/Makefile.in	Sat Mar  4 18:12:55 2000
+--- src/Makefile.in.orig	Fri Mar  3 13:37:26 2000
++++ src/Makefile.in	Mon Mar  6 23:29:17 2000
 @@ -95,7 +95,7 @@
  
  AM_YFLAGS = -d -t
  AM_LFLAGS = -i
 -AM_CFLAGS = -O3 -g
 +AM_CFLAGS = 
  DEFS = @DEFS@ -DDATADIR="\"${pkgdatadir}\""
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
  CONFIG_HEADER = config.h
+@@ -113,7 +113,7 @@
+ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+ LEXLIB = @LEXLIB@
+ CFLAGS = @CFLAGS@
+-COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(FREEBSD_CFLAGS)
+ CCLD = $(CC)
+ LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
+ DIST_COMMON =  ./stamp-h.in Makefile.am Makefile.in config.h.in lex.c \