diff --git a/www/Makefile b/www/Makefile
index 555f47999feb..68551865dd38 100644
--- a/www/Makefile
+++ b/www/Makefile
@@ -660,6 +660,7 @@
     SUBDIR += zope-formulator
     SUBDIR += zope-groupuserfolder
     SUBDIR += zope-guf
+    SUBDIR += zope-mindmapbbs
     SUBDIR += zope-parsedxml
     SUBDIR += zope-placelesstranslationservice
     SUBDIR += zope-proxyindex
diff --git a/www/mod_fastcgi/Makefile b/www/mod_fastcgi/Makefile
index ff1cbba9d5d0..c3412048db4f 100644
--- a/www/mod_fastcgi/Makefile
+++ b/www/mod_fastcgi/Makefile
@@ -14,10 +14,16 @@ MASTER_SITES=	ftp://ftp.holywar.net/pub/FreeBSD/ \
 MAINTAINER=	hollywar@mail.holywar.net
 COMMENT=	A fast-cgi module for Apache
 
-BUILD_DEPENDS=	${APXS}:${PORTSDIR}/${APACHE_PORT}
-
 CONFLICTS=	apache-contrib-1.*
 
+USE_APACHE=	yes
+
+.if exists(/usr/local/include/apache2/httpd.h)
+WITH_APACHE2=	yes
+.endif
+
+.include <bsd.port.pre.mk>
+
 .if defined(WITH_APACHE2)
 MAKEFILE=	Makefile.AP2
 USE_REINPLACE=	YES
@@ -65,4 +71,4 @@ post-install:
 	@${ECHO_MSG} "*                                                          *"
 	@${ECHO_MSG} "************************************************************"
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/www/zope-mindmapbbs/Makefile b/www/zope-mindmapbbs/Makefile
new file mode 100644
index 000000000000..16ed83691fb4
--- /dev/null
+++ b/www/zope-mindmapbbs/Makefile
@@ -0,0 +1,52 @@
+# New ports collection makefile for:	zope-mindmapbbs
+# Date created:				31 May 2004
+# Whom:					HAYASHI Yasushi <yasi@yasi.to>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	mindmapbbs
+PORTVERSION=	0.3.3
+CATEGORIES=	www zope
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_JP}
+MASTER_SITE_SUBDIR=	mindmapbbs/9624
+PKGNAMEPREFIX=	zope-
+DISTNAME=	MindMapBBS
+DIST_SUBDIR=	zope
+
+MAINTAINER=	yasi@yasi.to
+COMMENT=	A Zope product to create graphical BBS based on Mind Map
+
+USE_PYTHON=	yes
+USE_ZOPE=	yes
+
+ZOPEPRODUCTNAME=	MindMapBBS
+
+PLIST=		${WRKDIR}/pkg-plist
+WRKSRC=		${WRKDIR}/${ZOPEPRODUCTNAME}
+
+do-build:
+	-@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${WRKSRC}/
+
+pre-install:
+	@${RM} -f ${PLIST}
+	@${TOUCH} ${PLIST}
+	@cd ${WRKDIR} ;\
+	for f in `${FIND} ${ZOPEPRODUCTNAME} -type f`; do \
+		${ECHO_CMD} %%ZOPEPRODUCTDIR%%/$${f} >> ${PLIST}; \
+	done; \
+	for d in `${FIND} -d ${ZOPEPRODUCTNAME} -type d`; do \
+		${ECHO_CMD} @dirrm %%ZOPEPRODUCTDIR%%/$${d} >> ${PLIST}; \
+	done; \
+
+do-install:
+	@${MKDIR} ${ZOPEBASEDIR}/${ZOPEPRODUCTDIR}/
+	@${CHMOD} -R og+rX ${WRKSRC}/
+	@${CP} -R ${WRKSRC} ${ZOPEBASEDIR}/${ZOPEPRODUCTDIR}/
+
+post-install:
+.if !defined(BATCH)
+	@${CAT} ${PKGMESSAGE}
+.endif
+
+.include <bsd.port.mk>
diff --git a/www/zope-mindmapbbs/distinfo b/www/zope-mindmapbbs/distinfo
new file mode 100644
index 000000000000..11338cf09a2d
--- /dev/null
+++ b/www/zope-mindmapbbs/distinfo
@@ -0,0 +1,2 @@
+MD5 (zope/MindMapBBS.tar.gz) = 30ee3e2bc989d7cab2c220c52ecb3309
+SIZE (zope/MindMapBBS.tar.gz) = 9505
diff --git a/www/zope-mindmapbbs/pkg-descr b/www/zope-mindmapbbs/pkg-descr
new file mode 100644
index 000000000000..8f21fb00d6a7
--- /dev/null
+++ b/www/zope-mindmapbbs/pkg-descr
@@ -0,0 +1,9 @@
+MindMapBBS is a Zope product to create BBS based on Mind Map concept.
+See http://www.mind-map.com/EN/index.html to know what Mind Map is.
+
+To see MindMapBBS demonstration, access Author's Web site:
+
+WWW: http://akiyah.bglb.jp/smallproducts/MindMapBBS/
+
+- Yasushi Hayashi
+yasi@yasi.to
diff --git a/www/zope-mindmapbbs/pkg-message b/www/zope-mindmapbbs/pkg-message
new file mode 100644
index 000000000000..834c3fd7b06f
--- /dev/null
+++ b/www/zope-mindmapbbs/pkg-message
@@ -0,0 +1,8 @@
+To complete the installation of MindMapBBS
+
+  1. Restart Zope.  This may be done from the Zope Control Panel.
+
+  2. Add MindMapBBS object.
+
+  3. Add DTML Document which contains a line:
+      <dtml-var your-bbs-name>