diff --git a/emulators/catapult/Makefile b/emulators/catapult/Makefile
index 0a19198ff88a..38c401f48224 100644
--- a/emulators/catapult/Makefile
+++ b/emulators/catapult/Makefile
@@ -1,41 +1,44 @@
 # New ports collection makefile for:	emulators/catapult
 # Date created:				14 November 2007
 # Whom:					Martin Tournoij <carpetsmoker@xs4all.nl>
 #
-# $Carpetsmoker: ports/emulators/catapult/Makefile,v 1.1 2007/11/14 04:42:21 carpetsmoker Exp $
+# $Carpetsmoker: ports/emulators/catapult/Makefile,v 1.2 2008/07/21 12:54:29 carpetsmoker Exp $
 # $FreeBSD$
 #
 
 PORTNAME=	catapult
 PORTVERSION=	0.6.3R1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	emulators
 MASTER_SITES=	SF
 MASTER_SITE_SUBDIR=	openmsx
 DISTNAME=	openmsx-${PORTNAME}-${PORTVERSION:S/R1/-R1/}
 
-MAINTAINER=	carpetsmoker@xs4all.nl
+MAINTAINER=	carpetsmoker@rwxrwxrwx.net
 COMMENT=	GUI for openMSX
 
 BUILD_DEPENDS=	openmsx:${PORTSDIR}/emulators/openmsx
 RUN_DEPENDS=	openmsx:${PORTSDIR}/emulators/openmsx
 
 USE_GMAKE=	yes
 MAKEFILE=	GNUmakefile
 MAKE_ARGS+=	INSTALL_BASE=${PREFIX} \
 		INSTALL_SHARE_DIR=${DATADIR} \
 		INSTALL_DOC_DIR=${DOCSDIR} \
 		CATAPULT_OPENMSX_BINARY=${LOCALBASE}/bin/openmsx \
 		CATAPULT_OPENMSX_SHARE=${LOCALBASE}/share/openmsx
 USE_WX=		2.6
 USE_GNOME=	libxml2
 
 post-patch:
 	@${REINPLACE_CMD} 's|freebsd5\*|freebsd*|; s|x86_64)|amd64)|;' \
 	    ${WRKSRC}/build/detectsys.sh
 	@${REINPLACE_CMD} 's|@$$(CXX)|$$(CXX)|' ${WRKSRC}/build/main.mk
 	@${REINPLACE_CMD} 's|INSTALL_BASE|INSTALL_SHARE_DIR|' ${WRKSRC}/build/info2code.mk
 	@${REINPLACE_CMD} 's|wx-config|${WX_CONFIG}|g' \
 		${WRKSRC}/build/main.mk ${WRKSRC}/build/probe.mk
+.if defined(NOPORTDOCS)
+	@${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/build-main.mk
+.endif
 
 .include <bsd.port.mk>
diff --git a/emulators/catapult/files/build-main.mk b/emulators/catapult/files/build-main.mk
new file mode 100644
index 000000000000..801baaadd55e
--- /dev/null
+++ b/emulators/catapult/files/build-main.mk
@@ -0,0 +1,23 @@
+--- build/main.mk.orig	2008-07-21 14:43:22.000000000 +0200
++++ build/main.mk	2008-07-21 14:43:48.000000000 +0200
+@@ -371,13 +371,13 @@
+ 	@echo "  Data files..."
+ 	@mkdir -p $(INSTALL_SHARE_DIR)
+ 	@cp -rf $(RESOURCES_PATH) $(INSTALL_SHARE_DIR)/
+-	@echo "  Documentation..."
+-	@mkdir -p $(INSTALL_DOC_DIR)
+-	@cp -f README GPL AUTHORS $(INSTALL_DOC_DIR)
+-	@cp -f $(addprefix doc/,$(INSTALL_DOCS)) $(INSTALL_DOC_DIR)
+-	@mkdir -p $(INSTALL_DOC_DIR)/manual
+-	@cp -f $(addprefix doc/manual/,*.html *.css *.png) \
+-		$(INSTALL_DOC_DIR)/manual
++	@echo "  Skipping Documentation..."
++#	@mkdir -p $(INSTALL_DOC_DIR)
++#	@cp -f README GPL AUTHORS $(INSTALL_DOC_DIR)
++#	@cp -f $(addprefix doc/,$(INSTALL_DOCS)) $(INSTALL_DOC_DIR)
++#	@mkdir -p $(INSTALL_DOC_DIR)/manual
++#	@cp -f $(addprefix doc/manual/,*.html *.css *.png) \
++#		$(INSTALL_DOC_DIR)/manual
+ ifeq ($(CATAPULT_PREBUILT),false)
+ ifneq ($(CATAPULT_NO_DESKTOP_HOOKS),true)
+ 	@echo "  Desktop hooks..."