diff --git a/mail/bogofilter-current/Makefile b/mail/bogofilter-current/Makefile
index b90edd09b56b..dc376247f043 100644
--- a/mail/bogofilter-current/Makefile
+++ b/mail/bogofilter-current/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	bogofilter
-PORTVERSION=	0.15.13.2
+PORTVERSION=	0.16.4
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -39,6 +39,8 @@ CONFIGURE_ARGS+=	--sysconfdir=${PREFIX}/etc
 CONFIGURE_ENV?=	CPPFLAGS="-I${LOCALBASE}/include/db${WITH_DB_VER}" \
 		LDFLAGS="-L${LOCALBASE}/lib" LIBS="${libs}"
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+INSTALL_TARGET=	install-strip prefix=${PREFIX}
+
 MAN1=		bogofilter.1 bogoutil.1 bogoupgrade.1 bogolexer.1 bogotune.1
 
 post-patch:
@@ -46,7 +48,6 @@ post-patch:
 		${WRKSRC}/contrib/randomtrain \
 		${WRKSRC}/contrib/scramble \
 		${WRKSRC}/contrib/trainbogo.sh
-	${REINPLACE_CMD} -e "s/0.15.13.1/0.15.13.2/" ${WRKSRC}/src/version.c
 
 .if !defined(PKGNAMESUFFIX) && ${WITH_DB_VER} != 42
 pre-everything::
@@ -55,12 +56,13 @@ pre-everything::
 	@${ECHO} ""
 .endif
 
+.if !defined(NOPORTDOCS)
+PORTDOCS=	*
+.endif
+
 post-build::
 	cd ${WRKSRC} && make check SHELL=${SH}
 
-do-install:
-	cd ${WRKSRC} && make install-strip prefix=${PREFIX}
-
 post-install::
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
@@ -69,11 +71,8 @@ post-install::
 	@${MKDIR} ${DOCSDIR}/programmer
 	@${MKDIR} ${DOCSDIR}/xml
 .for i in AUTHORS COPYING INSTALL NEWS README README.cvs \
-	doc/README.validation TODO UPGRADE \
-	CHANGES-0.10 CHANGES-0.11 CHANGES-0.12 CHANGES-0.13 CHANGES-0.14 \
-	CHANGES-0.15 \
-	RELEASE.NOTES-0.11 RELEASE.NOTES-0.12 RELEASE.NOTES-0.13 \
-	RELEASE.NOTES-0.14 RELEASE.NOTES-0.15 \
+	doc/README.validation TODO \
+	CHANGES-* RELEASE.NOTES-* \
 	doc/integrating-with-postfix doc/integrating-with-qmail \
 	doc/bogofilter-tuning.HOWTO doc/bogofilter-SA-2002-01 METHODS \
 	doc/README.tdb
diff --git a/mail/bogofilter-current/distinfo b/mail/bogofilter-current/distinfo
index 6b5788694bf1..ce7d89f73374 100644
--- a/mail/bogofilter-current/distinfo
+++ b/mail/bogofilter-current/distinfo
@@ -1 +1,2 @@
-MD5 (bogofilter-0.15.13.2.tar.bz2) = 1d52ab08c6f198a511dc516a3ce801c5
+MD5 (bogofilter-0.16.4.tar.bz2) = eafe4d23e3c2a01f72f854c90afb31ea
+SIZE (bogofilter-0.16.4.tar.bz2) = 614298
diff --git a/mail/bogofilter-current/pkg-plist b/mail/bogofilter-current/pkg-plist
index 56c6918feacf..d82888eb7797 100644
--- a/mail/bogofilter-current/pkg-plist
+++ b/mail/bogofilter-current/pkg-plist
@@ -4,60 +4,3 @@ bin/bogotune
 bin/bogoutil
 bin/bogoupgrade
 etc/bogofilter.cf.example
-%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
-%%PORTDOCS%%%%DOCSDIR%%/AUTHORS.trio
-%%PORTDOCS%%%%DOCSDIR%%/CHANGES-0.10
-%%PORTDOCS%%%%DOCSDIR%%/CHANGES-0.11
-%%PORTDOCS%%%%DOCSDIR%%/CHANGES-0.12
-%%PORTDOCS%%%%DOCSDIR%%/CHANGES-0.13
-%%PORTDOCS%%%%DOCSDIR%%/CHANGES-0.14
-%%PORTDOCS%%%%DOCSDIR%%/CHANGES-0.15
-%%PORTDOCS%%%%DOCSDIR%%/COPYING
-%%PORTDOCS%%%%DOCSDIR%%/INSTALL
-%%PORTDOCS%%%%DOCSDIR%%/METHODS
-%%PORTDOCS%%%%DOCSDIR%%/NEWS
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/bogofilter-tuning.HOWTO
-%%PORTDOCS%%%%DOCSDIR%%/README.cvs
-%%PORTDOCS%%%%DOCSDIR%%/README.tdb
-%%PORTDOCS%%%%DOCSDIR%%/README.validation
-%%PORTDOCS%%%%DOCSDIR%%/RELEASE.NOTES-0.11
-%%PORTDOCS%%%%DOCSDIR%%/RELEASE.NOTES-0.12
-%%PORTDOCS%%%%DOCSDIR%%/RELEASE.NOTES-0.13
-%%PORTDOCS%%%%DOCSDIR%%/RELEASE.NOTES-0.14
-%%PORTDOCS%%%%DOCSDIR%%/RELEASE.NOTES-0.15
-%%PORTDOCS%%%%DOCSDIR%%/TODO
-%%PORTDOCS%%%%DOCSDIR%%/UPGRADE
-%%PORTDOCS%%%%DOCSDIR%%/bogofilter-SA-2002-01
-%%PORTDOCS%%%%DOCSDIR%%/contrib/README.contrib
-%%PORTDOCS%%%%DOCSDIR%%/contrib/README.randomtrain
-%%PORTDOCS%%%%DOCSDIR%%/contrib/bogo.R
-%%PORTDOCS%%%%DOCSDIR%%/contrib/bogofilter-qfe
-%%PORTDOCS%%%%DOCSDIR%%/contrib/bogogrep
-%%PORTDOCS%%%%DOCSDIR%%/contrib/bogominitrain.pl
-%%PORTDOCS%%%%DOCSDIR%%/contrib/dot-qmail-bogofilter-default
-%%PORTDOCS%%%%DOCSDIR%%/contrib/mime.get.rfc822
-%%PORTDOCS%%%%DOCSDIR%%/contrib/printmaildir.pl
-%%PORTDOCS%%%%DOCSDIR%%/contrib/randomtrain
-%%PORTDOCS%%%%DOCSDIR%%/contrib/scramble
-%%PORTDOCS%%%%DOCSDIR%%/html/bogofilter-faq.html
-%%PORTDOCS%%%%DOCSDIR%%/html/bogofilter-faq-fr.html
-%%PORTDOCS%%%%DOCSDIR%%/html/bogofilter.html
-%%PORTDOCS%%%%DOCSDIR%%/html/bogolexer.html
-%%PORTDOCS%%%%DOCSDIR%%/html/bogoupgrade.html
-%%PORTDOCS%%%%DOCSDIR%%/html/bogotune.html
-%%PORTDOCS%%%%DOCSDIR%%/html/bogotune-faq.html
-%%PORTDOCS%%%%DOCSDIR%%/html/bogoutil.html
-%%PORTDOCS%%%%DOCSDIR%%/integrating-with-postfix
-%%PORTDOCS%%%%DOCSDIR%%/integrating-with-qmail
-%%PORTDOCS%%%%DOCSDIR%%/programmer/README.freebsd
-%%PORTDOCS%%%%DOCSDIR%%/xml/bogofilter.xml
-%%PORTDOCS%%%%DOCSDIR%%/xml/bogolexer.xml
-%%PORTDOCS%%%%DOCSDIR%%/xml/bogoupgrade.xml
-%%PORTDOCS%%%%DOCSDIR%%/xml/bogotune.xml
-%%PORTDOCS%%%%DOCSDIR%%/xml/bogoutil.xml
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/xml
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/programmer
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/contrib
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/mail/bogofilter/Makefile b/mail/bogofilter/Makefile
index b90edd09b56b..dc376247f043 100644
--- a/mail/bogofilter/Makefile
+++ b/mail/bogofilter/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	bogofilter
-PORTVERSION=	0.15.13.2
+PORTVERSION=	0.16.4
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -39,6 +39,8 @@ CONFIGURE_ARGS+=	--sysconfdir=${PREFIX}/etc
 CONFIGURE_ENV?=	CPPFLAGS="-I${LOCALBASE}/include/db${WITH_DB_VER}" \
 		LDFLAGS="-L${LOCALBASE}/lib" LIBS="${libs}"
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+INSTALL_TARGET=	install-strip prefix=${PREFIX}
+
 MAN1=		bogofilter.1 bogoutil.1 bogoupgrade.1 bogolexer.1 bogotune.1
 
 post-patch:
@@ -46,7 +48,6 @@ post-patch:
 		${WRKSRC}/contrib/randomtrain \
 		${WRKSRC}/contrib/scramble \
 		${WRKSRC}/contrib/trainbogo.sh
-	${REINPLACE_CMD} -e "s/0.15.13.1/0.15.13.2/" ${WRKSRC}/src/version.c
 
 .if !defined(PKGNAMESUFFIX) && ${WITH_DB_VER} != 42
 pre-everything::
@@ -55,12 +56,13 @@ pre-everything::
 	@${ECHO} ""
 .endif
 
+.if !defined(NOPORTDOCS)
+PORTDOCS=	*
+.endif
+
 post-build::
 	cd ${WRKSRC} && make check SHELL=${SH}
 
-do-install:
-	cd ${WRKSRC} && make install-strip prefix=${PREFIX}
-
 post-install::
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
@@ -69,11 +71,8 @@ post-install::
 	@${MKDIR} ${DOCSDIR}/programmer
 	@${MKDIR} ${DOCSDIR}/xml
 .for i in AUTHORS COPYING INSTALL NEWS README README.cvs \
-	doc/README.validation TODO UPGRADE \
-	CHANGES-0.10 CHANGES-0.11 CHANGES-0.12 CHANGES-0.13 CHANGES-0.14 \
-	CHANGES-0.15 \
-	RELEASE.NOTES-0.11 RELEASE.NOTES-0.12 RELEASE.NOTES-0.13 \
-	RELEASE.NOTES-0.14 RELEASE.NOTES-0.15 \
+	doc/README.validation TODO \
+	CHANGES-* RELEASE.NOTES-* \
 	doc/integrating-with-postfix doc/integrating-with-qmail \
 	doc/bogofilter-tuning.HOWTO doc/bogofilter-SA-2002-01 METHODS \
 	doc/README.tdb
diff --git a/mail/bogofilter/distinfo b/mail/bogofilter/distinfo
index 6b5788694bf1..ce7d89f73374 100644
--- a/mail/bogofilter/distinfo
+++ b/mail/bogofilter/distinfo
@@ -1 +1,2 @@
-MD5 (bogofilter-0.15.13.2.tar.bz2) = 1d52ab08c6f198a511dc516a3ce801c5
+MD5 (bogofilter-0.16.4.tar.bz2) = eafe4d23e3c2a01f72f854c90afb31ea
+SIZE (bogofilter-0.16.4.tar.bz2) = 614298
diff --git a/mail/bogofilter/pkg-plist b/mail/bogofilter/pkg-plist
index 56c6918feacf..d82888eb7797 100644
--- a/mail/bogofilter/pkg-plist
+++ b/mail/bogofilter/pkg-plist
@@ -4,60 +4,3 @@ bin/bogotune
 bin/bogoutil
 bin/bogoupgrade
 etc/bogofilter.cf.example
-%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
-%%PORTDOCS%%%%DOCSDIR%%/AUTHORS.trio
-%%PORTDOCS%%%%DOCSDIR%%/CHANGES-0.10
-%%PORTDOCS%%%%DOCSDIR%%/CHANGES-0.11
-%%PORTDOCS%%%%DOCSDIR%%/CHANGES-0.12
-%%PORTDOCS%%%%DOCSDIR%%/CHANGES-0.13
-%%PORTDOCS%%%%DOCSDIR%%/CHANGES-0.14
-%%PORTDOCS%%%%DOCSDIR%%/CHANGES-0.15
-%%PORTDOCS%%%%DOCSDIR%%/COPYING
-%%PORTDOCS%%%%DOCSDIR%%/INSTALL
-%%PORTDOCS%%%%DOCSDIR%%/METHODS
-%%PORTDOCS%%%%DOCSDIR%%/NEWS
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/bogofilter-tuning.HOWTO
-%%PORTDOCS%%%%DOCSDIR%%/README.cvs
-%%PORTDOCS%%%%DOCSDIR%%/README.tdb
-%%PORTDOCS%%%%DOCSDIR%%/README.validation
-%%PORTDOCS%%%%DOCSDIR%%/RELEASE.NOTES-0.11
-%%PORTDOCS%%%%DOCSDIR%%/RELEASE.NOTES-0.12
-%%PORTDOCS%%%%DOCSDIR%%/RELEASE.NOTES-0.13
-%%PORTDOCS%%%%DOCSDIR%%/RELEASE.NOTES-0.14
-%%PORTDOCS%%%%DOCSDIR%%/RELEASE.NOTES-0.15
-%%PORTDOCS%%%%DOCSDIR%%/TODO
-%%PORTDOCS%%%%DOCSDIR%%/UPGRADE
-%%PORTDOCS%%%%DOCSDIR%%/bogofilter-SA-2002-01
-%%PORTDOCS%%%%DOCSDIR%%/contrib/README.contrib
-%%PORTDOCS%%%%DOCSDIR%%/contrib/README.randomtrain
-%%PORTDOCS%%%%DOCSDIR%%/contrib/bogo.R
-%%PORTDOCS%%%%DOCSDIR%%/contrib/bogofilter-qfe
-%%PORTDOCS%%%%DOCSDIR%%/contrib/bogogrep
-%%PORTDOCS%%%%DOCSDIR%%/contrib/bogominitrain.pl
-%%PORTDOCS%%%%DOCSDIR%%/contrib/dot-qmail-bogofilter-default
-%%PORTDOCS%%%%DOCSDIR%%/contrib/mime.get.rfc822
-%%PORTDOCS%%%%DOCSDIR%%/contrib/printmaildir.pl
-%%PORTDOCS%%%%DOCSDIR%%/contrib/randomtrain
-%%PORTDOCS%%%%DOCSDIR%%/contrib/scramble
-%%PORTDOCS%%%%DOCSDIR%%/html/bogofilter-faq.html
-%%PORTDOCS%%%%DOCSDIR%%/html/bogofilter-faq-fr.html
-%%PORTDOCS%%%%DOCSDIR%%/html/bogofilter.html
-%%PORTDOCS%%%%DOCSDIR%%/html/bogolexer.html
-%%PORTDOCS%%%%DOCSDIR%%/html/bogoupgrade.html
-%%PORTDOCS%%%%DOCSDIR%%/html/bogotune.html
-%%PORTDOCS%%%%DOCSDIR%%/html/bogotune-faq.html
-%%PORTDOCS%%%%DOCSDIR%%/html/bogoutil.html
-%%PORTDOCS%%%%DOCSDIR%%/integrating-with-postfix
-%%PORTDOCS%%%%DOCSDIR%%/integrating-with-qmail
-%%PORTDOCS%%%%DOCSDIR%%/programmer/README.freebsd
-%%PORTDOCS%%%%DOCSDIR%%/xml/bogofilter.xml
-%%PORTDOCS%%%%DOCSDIR%%/xml/bogolexer.xml
-%%PORTDOCS%%%%DOCSDIR%%/xml/bogoupgrade.xml
-%%PORTDOCS%%%%DOCSDIR%%/xml/bogotune.xml
-%%PORTDOCS%%%%DOCSDIR%%/xml/bogoutil.xml
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/xml
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/programmer
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/contrib
-%%PORTDOCS%%@dirrm %%DOCSDIR%%