diff --git a/security/cyrus-sasl2-gssapi/Makefile b/security/cyrus-sasl2-gssapi/Makefile
index 1c7b9a46a084..c6d4bb3b6c7e 100644
--- a/security/cyrus-sasl2-gssapi/Makefile
+++ b/security/cyrus-sasl2-gssapi/Makefile
@@ -2,12 +2,12 @@
 
 PORTNAME=	gssapi
 PORTVERSION=	2.1.26
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	security ipv6
 MASTER_SITES=	ftp://ftp.cyrusimap.org/cyrus-sasl/ \
 		http://cyrusimap.org/releases/
-PKGNAMEPREFIX=	cyrus-sasl2-
-DISTNAME=	cyrus-sasl-${PORTVERSION}
+PKGNAMEPREFIX=	cyrus-sasl-
+DISTNAME=	${PKGNAMEPREFIX}${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 b8b129d9235b..6111aa8c1f05 100644
--- a/security/cyrus-sasl2-ldapdb/Makefile
+++ b/security/cyrus-sasl2-ldapdb/Makefile
@@ -2,12 +2,12 @@
 
 PORTNAME=	ldapdb
 PORTVERSION=	2.1.26
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	security ipv6
 MASTER_SITES=	ftp://ftp.cyrusimap.org/cyrus-sasl/ \
 		http://cyrusimap.org/releases/
-PKGNAMEPREFIX=	cyrus-sasl2-
-DISTNAME=	cyrus-sasl-${PORTVERSION}
+PKGNAMEPREFIX=	cyrus-sasl-
+DISTNAME=	${PKGNAMEPREFIX}${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 a744cc1e48a1..5528a0cb9fbb 100644
--- a/security/cyrus-sasl2-saslauthd/Makefile
+++ b/security/cyrus-sasl2-saslauthd/Makefile
@@ -2,12 +2,12 @@
 
 PORTNAME=	saslauthd
 PORTVERSION=	2.1.26
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	security ipv6
 MASTER_SITES=	ftp://ftp.cyrusimap.org/cyrus-sasl/ \
 		http://cyrusimap.org/releases/
-PKGNAMEPREFIX=	cyrus-sasl2-
-DISTNAME=	cyrus-sasl-${PORTVERSION}
+PKGNAMEPREFIX=	cyrus-sasl-
+DISTNAME=	${PKGNAMEPREFIX}${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 1fad68b2a26f..b521e4e85e6c 100644
--- a/security/cyrus-sasl2/Makefile
+++ b/security/cyrus-sasl2/Makefile
@@ -1,12 +1,11 @@
 # $FreeBSD$
 
-PORTNAME=	cyrus-sasl2
+PORTNAME=	cyrus-sasl
 PORTVERSION=	2.1.26
-PORTREVISION=	11
+PORTREVISION=	12
 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)
@@ -35,6 +34,8 @@ CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/etc \
 		--disable-krb4
 MAKE_ENV+=	INSTALL_STRIP_FLAG=${STRIP}
 
+DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}2
+
 CPE_VENDOR=	cmu
 
 NO_OPTIONS_SORT=	yes