diff --git a/x11/mrxvt/Makefile b/x11/mrxvt/Makefile
index 55217012c5e8..7990fe60db5f 100644
--- a/x11/mrxvt/Makefile
+++ b/x11/mrxvt/Makefile
@@ -1,47 +1,64 @@
 # New ports collection makefile for:	mrxvt
 # Date created:				27 Nov 2004
 # Whom:					David Yeske <dyeske@gmail.com>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	mrxvt
 PORTVERSION=	0.4.2
 PORTREVISION=	2
 CATEGORIES=	x11
 MASTER_SITES=	SF
 MASTER_SITE_SUBDIR=	materm
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A tabbed version of rxvt
 
 LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 		png.5:${PORTSDIR}/graphics/png
 
 CONFLICTS=	mrxvt-0.5.*
 
 GNU_CONFIGURE=	yes
 USE_XORG=	x11
 
 .if defined(WITH_JAPANESE)
 CONFIGURE_ARGS+=	--enable-xim --enable-cjk --with-encoding=eucj
 .endif # WITH_JAPANESE
 
 .if defined(WITH_XFT)
 LIB_DEPENDS+=	Xft.2:${PORTSDIR}/x11-fonts/libXft
 CONFIGURE_ARGS+=	--enable-xft
 .endif
 
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
 		LIBS="${LIBS} -L${LOCALBASE}/lib"
 
+.if !defined(NOPORTDOCS)
+PORTDOCS=	TIPS \
+			README.greek \
+			README.menu \
+			README.xvt \
+			xdefaults-sample.txt \
+			xterm.seq \
+			mrxvt.vbs \
+			mrxvtset.pl
+.endif
+
 MAN1=		mrxvt.1
 
 pre-everything::
 	@${ECHO_MSG} "=========================================>"
 	@${ECHO_MSG} "For Japanese support use make -DWITH_JAPANESE install"
 	@${ECHO_MSG} "For XFT support use make -DWITH_XFT install"
 	@${ECHO_MSG} "=========================================>"
 
+.if defined(NOPORTDOCS)
+post-patch:
+	@${REINPLACE_CMD} -e '/^\(install-data-am:\).*/ \
+		s/install-docDATA //' ${WRKSRC}/doc/Makefile.in
+.endif
+
 .include <bsd.port.mk>
diff --git a/x11/mrxvt/pkg-plist b/x11/mrxvt/pkg-plist
index df2153e1294e..bd2d21208b2e 100644
--- a/x11/mrxvt/pkg-plist
+++ b/x11/mrxvt/pkg-plist
@@ -1,16 +1,7 @@
 bin/mrxvt
 share/pixmaps/mrxvt-csh.png
 share/pixmaps/mrxvt-csh.xpm
 share/pixmaps/mrxvt-root.png
 share/pixmaps/mrxvt-root.xpm
 share/pixmaps/mrxvt.png
 share/pixmaps/mrxvt.xpm
-%%PORTDOCS%%%%DOCSDIR%%/mrxvt.vbs
-%%PORTDOCS%%%%DOCSDIR%%/mrxvtset.pl
-%%PORTDOCS%%%%DOCSDIR%%/README.greek
-%%PORTDOCS%%%%DOCSDIR%%/README.menu
-%%PORTDOCS%%%%DOCSDIR%%/README.xvt
-%%PORTDOCS%%%%DOCSDIR%%/TIPS
-%%PORTDOCS%%%%DOCSDIR%%/xdefaults-sample.txt
-%%PORTDOCS%%%%DOCSDIR%%/xterm.seq
-%%PORTDOCS%%@dirrm %%DOCSDIR%%