diff --git a/games/quake2lnx/Makefile b/games/quake2lnx/Makefile
index 5c62da82a830..5c0c4eecbfe4 100644
--- a/games/quake2lnx/Makefile
+++ b/games/quake2lnx/Makefile
@@ -205,6 +205,10 @@ post-patch: .SILENT
 	${REINPLACE_CMD} -e '/BUILDSTRING/s|Linux|${OPSYS}|' \
 		-e '/CPUSTRING/s|Unknown|${ARCH}|' \
 		${WRKSRC}/src/qcommon/qcommon.h
+.if ${PORT_OPTIONS:MASM}
+	${REINPLACE_CMD} -e '/^SHLIBLDFLAGS/s|$$| -Wl,-z,notext|' \
+		${WRKSRC}/Makefile
+.endif
 
 do-install:
 .for tgt in ${EXE_TARGETS}
diff --git a/games/quake2lnx/files/patch-Makefile b/games/quake2lnx/files/patch-Makefile
index 9d786bfc81cf..9c189fe38381 100644
--- a/games/quake2lnx/files/patch-Makefile
+++ b/games/quake2lnx/files/patch-Makefile
@@ -122,7 +122,7 @@
  NULL_DIR=$(MOUNT_DIR)/null
  
 -BASE_CFLAGS=-Wall -pipe -Dstricmp=strcasecmp
-+BASE_CFLAGS=-pipe -Dstricmp=strcasecmp $(CFLAGS)
++BASE_CFLAGS=-Wall $(CFLAGS) -Dstricmp=strcasecmp
  ifeq ($(HAVE_IPV6),YES)
  BASE_CFLAGS+= -DHAVE_IPV6
  ifeq ($(OSTYPE),FreeBSD)