diff --git a/mail/bogofilter-sqlite/Makefile b/mail/bogofilter-sqlite/Makefile
index 5d38b987144b..0d2fe30a47d4 100644
--- a/mail/bogofilter-sqlite/Makefile
+++ b/mail/bogofilter-sqlite/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	bogofilter
-PORTREVISION=	1
+PORTREVISION=	0
 CATEGORIES=	mail
 PKGNAMESUFFIX=	-sqlite
 
diff --git a/mail/bogofilter-tc/Makefile b/mail/bogofilter-tc/Makefile
index d2d8b1b227fc..930535f24ec6 100644
--- a/mail/bogofilter-tc/Makefile
+++ b/mail/bogofilter-tc/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	bogofilter
-PORTREVISION=	1
+PORTREVISION=	0
 CATEGORIES=	mail
 PKGNAMESUFFIX=	-tc
 
diff --git a/mail/bogofilter/Makefile b/mail/bogofilter/Makefile
index d3449551b9e9..5961214c6293 100644
--- a/mail/bogofilter/Makefile
+++ b/mail/bogofilter/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	bogofilter
-PORTVERSION=	1.2.1
-PORTREVISION?=	2
+PORTVERSION=	1.2.2
+PORTREVISION?=	0
 CATEGORIES?=	mail
-MASTER_SITES=	SF/bogofilter/bogofilter-stable/bogofilter-${PORTVERSION}
+MASTER_SITES=	SF/bogofilter/bogofilter-current/bogofilter-${PORTVERSION}
 
 MAINTAINER?=	mandree@FreeBSD.org
 COMMENT=	Fast, teachable, learning spam detector
diff --git a/mail/bogofilter/distinfo b/mail/bogofilter/distinfo
index 347728ddb4a1..82144261810d 100644
--- a/mail/bogofilter/distinfo
+++ b/mail/bogofilter/distinfo
@@ -1,3 +1,3 @@
-MD5 (bogofilter-1.2.1.tar.bz2) = 2eb802f4e271b99c3d8f68b14f8df9ef
-SHA256 (bogofilter-1.2.1.tar.bz2) = 7f90dd32b2887860896683ab8ba378c1f9c1a7a55ddee64057df5b773c4cb33c
-SIZE (bogofilter-1.2.1.tar.bz2) = 857088
+MD5 (bogofilter-1.2.2.tar.bz2) = 4bcabdf8c5e7efefcb508eda7e80eebc
+SHA256 (bogofilter-1.2.2.tar.bz2) = d8cfd1e68375ac8131de8a6998a38ee5b3f7d1151e71efd2b436183545216039
+SIZE (bogofilter-1.2.2.tar.bz2) = 867043
diff --git a/mail/bogofilter/files/patch-base64 b/mail/bogofilter/files/patch-base64
deleted file mode 100644
index a44616136661..000000000000
--- a/mail/bogofilter/files/patch-base64
+++ /dev/null
@@ -1,18 +0,0 @@
-Index: base64.c
-===================================================================
---- src/base64.c	(Revision 6766)
-+++ src/base64.c	(Revision 6921)
-@@ -61,9 +61,11 @@
- 	    d[i] = c;
- 	    v = v >> 8;
- 	}
--	d += 3 - shorten;
--	count += 3 - shorten;
-+    if(shorten != 4) {
-+        d += 3 - shorten;
-+        count += 3 - shorten;
-     }
-+    }
-     /* XXX do we need this NUL byte? */
-     if (word->leng)
- 	*d = (byte) '\0'; /* safe, base64 is always longer than original */