diff --git a/mail/bogofilter-current/Makefile b/mail/bogofilter-current/Makefile
index f2291ff0c646..63e5c0271019 100644
--- a/mail/bogofilter-current/Makefile
+++ b/mail/bogofilter-current/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	bogofilter
-PORTVERSION=	0.10.3.1
-PORTREVISION=	0
+PORTVERSION=	0.11.1
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -22,31 +21,33 @@ GNU_CONFIGURE=	yes
 PATCH_STRIP=	-p1
 CONFIGURE_ENV=	CPPFLAGS="-I${PREFIX}/include/db4" \
 		LDFLAGS="-L${PREFIX}/lib"
-CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/etc --with-db=defeat-guessing
-CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
+CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/etc --program-transform-name=
+CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 MAN1=		bogofilter.1 bogoutil.1 bogoupgrade.1 bogolexer.1
 
-post-build:
+post-build::
+	cd ${WRKSRC}/doc && make bogofilter.html bogolexer.html bogoutil.html bogoupgrade.html
 	cd ${WRKSRC} && make check SHELL=${SH}
 
 do-install:
 	cd ${WRKSRC} && make install-strip prefix=${PREFIX}
 
 .if !defined(NOPORTDOCS)
-post-install:
+post-install::
 	@${MKDIR} ${DOCSDIR}
 	@${MKDIR} ${DOCSDIR}/contrib
 	@${MKDIR} ${DOCSDIR}/html
 	@${MKDIR} ${DOCSDIR}/programmer
 	@${MKDIR} ${DOCSDIR}/xml
 .for i in AUTHORS CHANGES-0.10 COPYING INSTALL NEWS README README.cvs \
-	TODO UPGRADE \
+	TODO UPGRADE CHANGES-0.11 \
 	doc/integrating-with-qmail \
 	doc/README.Robinson doc/bogofilter-SA-2002-01 METHODS
 	  ${INSTALL_MAN} ${WRKSRC}/${i} ${DOCSDIR}
 .endfor
 .for i in contrib/bogo.R contrib/bogofilter-qfe \
-		contrib/randomtrain contrib/scramble
+		contrib/randomtrain contrib/scramble \
+		contrib/printmaildir.pl
 	  ${INSTALL_SCRIPT} ${WRKSRC}/${i} ${DOCSDIR}/contrib
 .endfor
 .for i in contrib/README.randomtrain contrib/dot-qmail-bogofilter-default
diff --git a/mail/bogofilter-current/distinfo b/mail/bogofilter-current/distinfo
index b697635e689b..28a0535e5457 100644
--- a/mail/bogofilter-current/distinfo
+++ b/mail/bogofilter-current/distinfo
@@ -1 +1 @@
-MD5 (bogofilter-0.10.3.1.tar.gz) = 634ef65d0548ce60edb9d983bdd21993
+MD5 (bogofilter-0.11.1.tar.gz) = 95fd3ad778911796397c45fed4ef1ebf
diff --git a/mail/bogofilter-current/pkg-plist b/mail/bogofilter-current/pkg-plist
index f2dfbccd1b35..7a6106a35a58 100644
--- a/mail/bogofilter-current/pkg-plist
+++ b/mail/bogofilter-current/pkg-plist
@@ -5,6 +5,7 @@ bin/bogoupgrade
 etc/bogofilter.cf.example
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/CHANGES-0.10
+%%PORTDOCS%%%%DOCSDIR%%/CHANGES-0.11
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL
 %%PORTDOCS%%%%DOCSDIR%%/METHODS
@@ -20,6 +21,7 @@ etc/bogofilter.cf.example
 %%PORTDOCS%%%%DOCSDIR%%/contrib/bogofilter-qfe
 %%PORTDOCS%%%%DOCSDIR%%/contrib/bogogrep
 %%PORTDOCS%%%%DOCSDIR%%/contrib/dot-qmail-bogofilter-default
+%%PORTDOCS%%%%DOCSDIR%%/contrib/printmaildir.pl
 %%PORTDOCS%%%%DOCSDIR%%/contrib/randomtrain
 %%PORTDOCS%%%%DOCSDIR%%/contrib/scramble
 %%PORTDOCS%%%%DOCSDIR%%/html/bogofilter-faq.html
diff --git a/mail/bogofilter/Makefile b/mail/bogofilter/Makefile
index f2291ff0c646..63e5c0271019 100644
--- a/mail/bogofilter/Makefile
+++ b/mail/bogofilter/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	bogofilter
-PORTVERSION=	0.10.3.1
-PORTREVISION=	0
+PORTVERSION=	0.11.1
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -22,31 +21,33 @@ GNU_CONFIGURE=	yes
 PATCH_STRIP=	-p1
 CONFIGURE_ENV=	CPPFLAGS="-I${PREFIX}/include/db4" \
 		LDFLAGS="-L${PREFIX}/lib"
-CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/etc --with-db=defeat-guessing
-CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
+CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/etc --program-transform-name=
+CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 MAN1=		bogofilter.1 bogoutil.1 bogoupgrade.1 bogolexer.1
 
-post-build:
+post-build::
+	cd ${WRKSRC}/doc && make bogofilter.html bogolexer.html bogoutil.html bogoupgrade.html
 	cd ${WRKSRC} && make check SHELL=${SH}
 
 do-install:
 	cd ${WRKSRC} && make install-strip prefix=${PREFIX}
 
 .if !defined(NOPORTDOCS)
-post-install:
+post-install::
 	@${MKDIR} ${DOCSDIR}
 	@${MKDIR} ${DOCSDIR}/contrib
 	@${MKDIR} ${DOCSDIR}/html
 	@${MKDIR} ${DOCSDIR}/programmer
 	@${MKDIR} ${DOCSDIR}/xml
 .for i in AUTHORS CHANGES-0.10 COPYING INSTALL NEWS README README.cvs \
-	TODO UPGRADE \
+	TODO UPGRADE CHANGES-0.11 \
 	doc/integrating-with-qmail \
 	doc/README.Robinson doc/bogofilter-SA-2002-01 METHODS
 	  ${INSTALL_MAN} ${WRKSRC}/${i} ${DOCSDIR}
 .endfor
 .for i in contrib/bogo.R contrib/bogofilter-qfe \
-		contrib/randomtrain contrib/scramble
+		contrib/randomtrain contrib/scramble \
+		contrib/printmaildir.pl
 	  ${INSTALL_SCRIPT} ${WRKSRC}/${i} ${DOCSDIR}/contrib
 .endfor
 .for i in contrib/README.randomtrain contrib/dot-qmail-bogofilter-default
diff --git a/mail/bogofilter/distinfo b/mail/bogofilter/distinfo
index b697635e689b..28a0535e5457 100644
--- a/mail/bogofilter/distinfo
+++ b/mail/bogofilter/distinfo
@@ -1 +1 @@
-MD5 (bogofilter-0.10.3.1.tar.gz) = 634ef65d0548ce60edb9d983bdd21993
+MD5 (bogofilter-0.11.1.tar.gz) = 95fd3ad778911796397c45fed4ef1ebf
diff --git a/mail/bogofilter/pkg-plist b/mail/bogofilter/pkg-plist
index f2dfbccd1b35..7a6106a35a58 100644
--- a/mail/bogofilter/pkg-plist
+++ b/mail/bogofilter/pkg-plist
@@ -5,6 +5,7 @@ bin/bogoupgrade
 etc/bogofilter.cf.example
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/CHANGES-0.10
+%%PORTDOCS%%%%DOCSDIR%%/CHANGES-0.11
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL
 %%PORTDOCS%%%%DOCSDIR%%/METHODS
@@ -20,6 +21,7 @@ etc/bogofilter.cf.example
 %%PORTDOCS%%%%DOCSDIR%%/contrib/bogofilter-qfe
 %%PORTDOCS%%%%DOCSDIR%%/contrib/bogogrep
 %%PORTDOCS%%%%DOCSDIR%%/contrib/dot-qmail-bogofilter-default
+%%PORTDOCS%%%%DOCSDIR%%/contrib/printmaildir.pl
 %%PORTDOCS%%%%DOCSDIR%%/contrib/randomtrain
 %%PORTDOCS%%%%DOCSDIR%%/contrib/scramble
 %%PORTDOCS%%%%DOCSDIR%%/html/bogofilter-faq.html