diff --git a/games/frotz/Makefile b/games/frotz/Makefile
index 948856391d34..a5fe55f313ff 100644
--- a/games/frotz/Makefile
+++ b/games/frotz/Makefile
@@ -6,23 +6,24 @@
 #
 
 PORTNAME=	frotz
-PORTVERSION=	2.40
+PORTVERSION=	2.41
 CATEGORIES=	games
 MASTER_SITES=	http://www.cs.csubak.edu/~dgriffi/frotz/files/ \
 		ftp://ftp.gmd.de/if-archive/infocom/interpreters/frotz/
 
 MAINTAINER=	ports@FreeBSD.org
 
-ALL_TARGET=	# empty
+MAKE_ARGS=	CC="${CC}" OPTS="${CFLAGS}" PREFIX="${PREFIX}" \
+		CONFIG_DIR="${PREFIX}/etc" INCL="" LIB=""
 
 MAN6=		frotz.6
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/frotz ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/frotz.6 ${PREFIX}/man/man6
+	${INSTALL_MAN} ${WRKSRC}/frotz.6 ${MANPREFIX}/man/man6
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${PREFIX}/share/doc/frotz
-.for file in AUTHORS BUGS ChangeLog HOW_TO_PLAY INSTALL README TODO
+.for file in BUGS HOW_TO_PLAY README
 	${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/frotz
 .endfor
 .endif
diff --git a/games/frotz/distinfo b/games/frotz/distinfo
index 26d2a1d24b28..99dc4acd74d7 100644
--- a/games/frotz/distinfo
+++ b/games/frotz/distinfo
@@ -1 +1 @@
-MD5 (frotz-2.40.tar.gz) = b19fa5528e6a5ea13afeecf8b38cccc3
+MD5 (frotz-2.41.tar.gz) = 520e0b6c39ddcd11f7adb6486b6d913a
diff --git a/games/frotz/files/patch-aa b/games/frotz/files/patch-aa
deleted file mode 100644
index be4350ccca1a..000000000000
--- a/games/frotz/files/patch-aa
+++ /dev/null
@@ -1,61 +0,0 @@
---- Makefile.orig	Sat Nov 11 20:50:16 2000
-+++ Makefile	Wed Nov 22 21:16:35 2000
-@@ -1,26 +1,26 @@
- #Define your C compiler.  I recommend gcc if you have it.
--CC = gcc
-+#CC = gcc
- #CC = cc
- 
- # Define your optimization flags.  Most compilers understand -O and -O2,
- # Standard (note: Solaris on UltraSparc using gcc 2.8.x might not like this.)
--OPTS = -O2 
-+#OPTS = -O2 
- # Pentium with gcc 2.7.0 or better
- #OPTS = -O2 -fomit-frame-pointer -malign-functions=2 -malign-loops=2 \
- #-malign-jumps=2
- 
- # Define where you want Frotz to be installed.  Usually this is /usr/local
--PREFIX = /usr/local
-+#PREFIX = /usr/local
- #PREFIX =
- 
- # Define where you want Frotz to look for frotz.conf.
--CONFIG_DIR = /usr/local/etc
-+CONFIG_DIR = ${PREFIX}/etc
- #CONFIG_DIR = /etc
- #CONFIG_DIR = /usr/pkg/etc
- #CONFIG_DIR =
- 
- # Uncomment this if you want color support.  Usually this requires ncurses.
--#COLOR_DEFS = -DCOLOR_SUPPORT
-+COLOR_DEFS = -DCOLOR_SUPPORT
- 
- # Uncomment this if you have an OSS soundcard driver and want classical
- # Infocom sound support.
-@@ -28,7 +28,7 @@
- 
- # This should point to the location of your curses.h or ncurses.h include
- # file if your compiler doesn't know about it.
--INCL = -I/usr/local/include
-+#INCL = -I/usr/local/include
- #INCL = -I/usr/pkg/include
- #INCL = -I/usr/freeware/include
- #INCL = -I/5usr/include
-@@ -37,7 +37,7 @@
- # This should define the location and name of whatever curses library you're
- # linking with.  Usually, this isn't necessary if /etc/ld.so.conf is set
- # up correctly.
--LIB = -L/usr/local/lib
-+#LIB = -L/usr/local/lib
- #LIB = -L/usr/pkg/lib
- #LIB = -L/usr/freeware/lib
- #LIB = -L/5usr/lib
-@@ -81,7 +81,7 @@
- COMP_DEFS = $(OPT_DEFS) $(COLOR_DEFS) $(SOUND_DEFS) $(SOUNDCARD) \
- 	$(MEMMOVE_DEF)
- 
--CFLAGS = $(OPTS) $(COMP_DEFS) $(INCL)
-+CFLAGS += $(OPTS) $(COMP_DEFS) $(INCL)
- 
- 
- $(BINNAME): soundcard.h $(OBJECTS)
diff --git a/games/frotz/pkg-plist b/games/frotz/pkg-plist
index 351c941c9736..a629939bb830 100644
--- a/games/frotz/pkg-plist
+++ b/games/frotz/pkg-plist
@@ -1,9 +1,5 @@
 bin/frotz
-share/doc/frotz/AUTHORS
-share/doc/frotz/BUGS
-share/doc/frotz/ChangeLog
-share/doc/frotz/HOW_TO_PLAY
-share/doc/frotz/INSTALL
-share/doc/frotz/README
-share/doc/frotz/TODO
-@dirrm share/doc/frotz
+%%PORTDOCS%%share/doc/frotz/BUGS
+%%PORTDOCS%%share/doc/frotz/HOW_TO_PLAY
+%%PORTDOCS%%share/doc/frotz/README
+%%PORTDOCS%%@dirrm share/doc/frotz