diff --git a/games/quake2-rogue/Makefile b/games/quake2-rogue/Makefile
index 30cdca4d6d5a..03c16f218937 100644
--- a/games/quake2-rogue/Makefile
+++ b/games/quake2-rogue/Makefile
@@ -1,35 +1,34 @@
 PORTNAME=	rogue
 PORTVERSION=	3.20
 CATEGORIES=	games
 MASTER_SITES=	IDSOFTWARE/quake2/source
 PKGNAMEPREFIX=	${Q2PKGNAMEPREFIX}
 DISTNAME=	${PORTNAME}src${PORTVERSION:S/.//}
 EXTRACT_SUFX=	.shar.Z
 
 MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	Quake II: Ground Zero (Rogue) official mission pack
 WWW=		http://www.idsoftware.com/games/quake/quake2-grndzero/
 
+MAKEFILE=	${FILESDIR}/Makefile
 NO_WRKSUBDIR=	yes
 SUB_FILES=	pkg-message
 
 PLIST_FILES=	%%Q2DIR%%/${PORTNAME}/game.so
 PLIST_DIRS=	%%Q2DIR%%/${PORTNAME}
 
 do-extract:
 	@cd ${WRKSRC} && uncompress -c ${DISTDIR}/${DISTFILES} | \
 		${TAIL} +454 | ${SH}
 
-post-extract:
-	@${CP} ${FILESDIR}/${MAKEFILE} ${WRKSRC}
-
 post-patch:
 	@${REINPLACE_CMD} -e '/#include <nan\.h>/d' ${WRKSRC}/g_local.h
+	@${REINPLACE_CMD} -e '/extern SP_monster_makron/d' ${WRKSRC}/m_boss31.c
 	@${REINPLACE_CMD} -e 's/__linux__/__unix__/' ${WRKSRC}/q_shared.[ch]
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${Q2DIR}/${PORTNAME}
 	${INSTALL_PROGRAM} ${WRKSRC}/game.so ${STAGEDIR}${Q2DIR}/${PORTNAME}
 
 .include "${.CURDIR}/../quake2-data/Makefile.include"
 .include <bsd.port.mk>
diff --git a/games/quake2-rogue/files/Makefile b/games/quake2-rogue/files/Makefile
index a56946b74afe..bfc8d9385be2 100644
--- a/games/quake2-rogue/files/Makefile
+++ b/games/quake2-rogue/files/Makefile
@@ -1,72 +1,70 @@
 SHLIB=		game
 SHLIB_NAME=	game.so
 
 SRCS=		dm_ball.c \
 		dm_tag.c \
 		g_ai.c \
 		g_chase.c \
 		g_cmds.c \
 		g_combat.c \
 		g_func.c \
 		g_items.c \
 		g_main.c \
 		g_misc.c \
 		g_monster.c \
 		g_newai.c \
 		g_newdm.c \
 		g_newfnc.c \
 		g_newtarg.c \
 		g_newtrig.c \
 		g_newweap.c \
 		g_phys.c \
 		g_save.c \
 		g_spawn.c \
 		g_sphere.c \
 		g_svcmds.c \
 		g_target.c \
 		g_trigger.c \
 		g_turret.c \
 		g_utils.c \
 		g_weapon.c \
 		m_actor.c \
 		m_berserk.c \
 		m_boss2.c \
 		m_boss3.c \
 		m_boss31.c \
 		m_boss32.c \
 		m_brain.c \
 		m_carrier.c \
 		m_chick.c \
 		m_flash.c \
 		m_flipper.c \
 		m_float.c \
 		m_flyer.c \
 		m_gladiator.c \
 		m_gunner.c \
 		m_hover.c \
 		m_infantry.c \
 		m_insane.c \
 		m_medic.c \
 		m_move.c \
 		m_mutant.c \
 		m_parasite.c \
 		m_soldier.c \
 		m_stalker.c \
 		m_supertank.c \
 		m_tank.c \
 		m_turret.c \
 		m_widow.c \
 		m_widow2.c \
 		p_client.c \
 		p_hud.c \
 		p_trail.c \
 		p_view.c \
 		p_weapon.c \
 		q_shared.c
 
-CFLAGS+=	-Dstricmp=strcasecmp -ffast-math -funroll-loops \
-		-fomit-frame-pointer -fexpensive-optimizations
-
-LDFLAGS+=	-L/lib -L/usr/lib -lm
+CFLAGS+=	-Dstricmp=strcasecmp -ffast-math \
+		-Wno-incompatible-function-pointer-types
 
 .include <bsd.lib.mk>