diff --git a/security/cyrus-sasl2-gssapi/Makefile b/security/cyrus-sasl2-gssapi/Makefile
index 0602aa60ac33..1c7b9a46a084 100644
--- a/security/cyrus-sasl2-gssapi/Makefile
+++ b/security/cyrus-sasl2-gssapi/Makefile
@@ -2,12 +2,12 @@
 
 PORTNAME=	gssapi
 PORTVERSION=	2.1.26
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	security ipv6
 MASTER_SITES=	ftp://ftp.cyrusimap.org/cyrus-sasl/ \
 		http://cyrusimap.org/releases/
-PKGNAMEPREFIX=	cyrus-sasl-
-DISTNAME=	${PKGNAMEPREFIX}${PORTVERSION}
+PKGNAMEPREFIX=	cyrus-sasl2-
+DISTNAME=	cyrus-sasl-${PORTVERSION}
 
 MAINTAINER=	ume@FreeBSD.org
 COMMENT=	SASL GSSAPI authentication plugin
diff --git a/security/cyrus-sasl2-ldapdb/Makefile b/security/cyrus-sasl2-ldapdb/Makefile
index 69d6e479969d..b8b129d9235b 100644
--- a/security/cyrus-sasl2-ldapdb/Makefile
+++ b/security/cyrus-sasl2-ldapdb/Makefile
@@ -2,12 +2,12 @@
 
 PORTNAME=	ldapdb
 PORTVERSION=	2.1.26
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	security ipv6
 MASTER_SITES=	ftp://ftp.cyrusimap.org/cyrus-sasl/ \
 		http://cyrusimap.org/releases/
-PKGNAMEPREFIX=	cyrus-sasl-
-DISTNAME=	${PKGNAMEPREFIX}${PORTVERSION}
+PKGNAMEPREFIX=	cyrus-sasl2-
+DISTNAME=	cyrus-sasl-${PORTVERSION}
 
 MAINTAINER=	ume@FreeBSD.org
 COMMENT=	SASL LDAPDB auxprop plugin
diff --git a/security/cyrus-sasl2-saslauthd/Makefile b/security/cyrus-sasl2-saslauthd/Makefile
index d0124cda54fa..a744cc1e48a1 100644
--- a/security/cyrus-sasl2-saslauthd/Makefile
+++ b/security/cyrus-sasl2-saslauthd/Makefile
@@ -2,12 +2,12 @@
 
 PORTNAME=	saslauthd
 PORTVERSION=	2.1.26
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security ipv6
 MASTER_SITES=	ftp://ftp.cyrusimap.org/cyrus-sasl/ \
 		http://cyrusimap.org/releases/
-PKGNAMEPREFIX=	cyrus-sasl-
-DISTNAME=	${PKGNAMEPREFIX}${PORTVERSION}
+PKGNAMEPREFIX=	cyrus-sasl2-
+DISTNAME=	cyrus-sasl-${PORTVERSION}
 
 MAINTAINER=	ume@FreeBSD.org
 COMMENT=	SASL authentication server for cyrus-sasl2
diff --git a/security/cyrus-sasl2/Makefile b/security/cyrus-sasl2/Makefile
index 8adac9dd551b..3992166ebe7b 100644
--- a/security/cyrus-sasl2/Makefile
+++ b/security/cyrus-sasl2/Makefile
@@ -1,11 +1,12 @@
 # $FreeBSD$
 
-PORTNAME=	cyrus-sasl
+PORTNAME=	cyrus-sasl2
 PORTVERSION=	2.1.26
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	security ipv6
 MASTER_SITES=	ftp://ftp.cyrusimap.org/cyrus-sasl/ \
 		http://cyrusimap.org/releases/
+DISTNAME=	cyrus-sasl-${PORTVERSION}
 
 MAINTAINER=	ume@FreeBSD.org
 COMMENT=	RFC 2222 SASL (Simple Authentication and Security Layer)