diff --git a/www/mod_auth_imap2/Makefile b/www/mod_auth_imap2/Makefile
index 9cbde573d37d..0d94766d4f57 100644
--- a/www/mod_auth_imap2/Makefile
+++ b/www/mod_auth_imap2/Makefile
@@ -6,17 +6,17 @@
 #
 
 PORTNAME=	mod_auth_imap
-PORTVERSION=	2.0.2
+PORTVERSION=	2.2.0
 CATEGORIES=	www
-# real location is http://ben.brillat.net/files/projects/mod_auth_imap2/mod_auth_imap2-current.tar.gz
-MASTER_SITES=	http://sheepkiller.nerim.net/ports/${PORTNAME}/
-DIST_SUBDIR=	apache2
+MASTER_SITES=	http://ben.brillat.net/files/projects/mod_auth_imap2/
+DISTNAME=	mod_auth_imap2-${PORTVERSION}
+DIST_SUBDIR=	apache20
 
 MAINTAINER=	apache@FreeBSD.org
 COMMENT=	An Apache 2 module to provide authentication via an IMAP mail server
 
 WRKSRC=		${WRKDIR}/${PORTNAME}2-${PORTVERSION}
-USE_APACHE=	20
+USE_APACHE=	20+
 LATEST_LINK=	mod_auth_imap2
 AP_FAST_BUILD=	YES
 AP_GENPLIST=	YES
diff --git a/www/mod_auth_imap2/distinfo b/www/mod_auth_imap2/distinfo
index 2c01ef46821b..91d35dd6d1c2 100644
--- a/www/mod_auth_imap2/distinfo
+++ b/www/mod_auth_imap2/distinfo
@@ -1,3 +1,3 @@
-MD5 (apache2/mod_auth_imap-2.0.2.tar.gz) = e49a8c061a659c19bca3a53098fbe792
-SHA256 (apache2/mod_auth_imap-2.0.2.tar.gz) = 8bdbf043d46bcb9ee57eb77825b5202e80cbaa865c640db663ab2143ace71dfc
-SIZE (apache2/mod_auth_imap-2.0.2.tar.gz) = 12699
+MD5 (apache20/mod_auth_imap2-2.2.0.tar.gz) = 28d648942d37df92cabdbccf0e962e05
+SHA256 (apache20/mod_auth_imap2-2.2.0.tar.gz) = 9642a13932010b9587d7b2263f21bed29602253bac18cb6c8847385d13d3cce0
+SIZE (apache20/mod_auth_imap2-2.2.0.tar.gz) = 12787