diff --git a/mail/qmail-smtp_auth+tls/Makefile b/mail/qmail-smtp_auth+tls/Makefile
index ac0c3a81af32..84f0e180bc62 100644
--- a/mail/qmail-smtp_auth+tls/Makefile
+++ b/mail/qmail-smtp_auth+tls/Makefile
@@ -7,7 +7,6 @@
 
 PORTNAME=	qmail
 PORTVERSION=	${QMAIL_VERSION}.${TLS_PATCH_DATE}
-PORTREVISION=	1
 CATEGORIES=	mail
 PKGNAMESUFFIX=	-tls
 
@@ -19,7 +18,7 @@ MAINTAINER=	lioux@FreeBSD.org
 
 USE_OPENSSL=	YES
 
-TLS_PATCH_DATE=	20000823
+TLS_PATCH_DATE=	20010627
 
 # Using default from master port, i.e., /var/qmail
 PREFIX?=	${QMAIL_PORT_PREFIX}
@@ -64,9 +63,9 @@ certificate:
 			${MKDIR} ${WRKDIR} ; \
 		fi ; \
 		${OPENSSLBASE}/bin/openssl req -new -x509 -nodes \
-			-out ${WRKDIR}/cert.pem -days 366 \
-			-keyout ${WRKDIR}/cert.pem ; \
-		${INSTALL} -o qmaild -g qmail -m 0640 ${WRKDIR}/cert.pem ${PREFIX}/control/cert.pem ; \
+			-out ${WRKDIR}/servercert.pem -days 366 \
+			-keyout ${WRKDIR}/servercert.pem ; \
+		${INSTALL} -o qmaild -g qmail -m 0640 ${WRKDIR}/servercert.pem ${PREFIX}/control/servercert.pem ; \
 		${ECHO_MSG} "===> Do not forget to do 'make clean' to clean up temporary files" ; \
 	else \
 		${ECHO_MSG} "===> You must create the file ${OPENSSLDIR}/openssl.cnf first." ; \
@@ -81,12 +80,12 @@ certificate-req:
 		fi ; \
 		${OPENSSLBASE}/bin/openssl req -new -nodes \
 			-out ${WRKDIR}/req.pem \
-			-keyout ${WRKDIR}/cert.pem ; \
-		${INSTALL} -o qmaild -g qmail -m 0640 ${WRKDIR}/cert.pem ${PREFIX}/control/cert.pem ; \
+			-keyout ${WRKDIR}/servercert.pem ; \
+		${INSTALL} -o qmaild -g qmail -m 0640 ${WRKDIR}/servercert.pem ${PREFIX}/control/servercert.pem ; \
 		${ECHO_MSG} ; \
 		${ECHO_MSG} "===> Do not forget to do 'make clean' to clean up temporary files" ; \
 		${ECHO_MSG} "===> Send ${WRKDIR}/req.pem to your CA to obtain signed_req.pem, and do:" ; \
-		${ECHO_MSG} "===> cat signed_req.pem >> ${PREFIX}/control/cert.pem" ; \
+		${ECHO_MSG} "===> cat signed_req.pem >> ${PREFIX}/control/servercert.pem" ; \
 	else \
 		${ECHO_MSG} "===> You must create the file ${OPENSSLDIR}/openssl.cnf first." ; \
 	fi
diff --git a/mail/qmail-smtp_auth/Makefile b/mail/qmail-smtp_auth/Makefile
index ac0c3a81af32..84f0e180bc62 100644
--- a/mail/qmail-smtp_auth/Makefile
+++ b/mail/qmail-smtp_auth/Makefile
@@ -7,7 +7,6 @@
 
 PORTNAME=	qmail
 PORTVERSION=	${QMAIL_VERSION}.${TLS_PATCH_DATE}
-PORTREVISION=	1
 CATEGORIES=	mail
 PKGNAMESUFFIX=	-tls
 
@@ -19,7 +18,7 @@ MAINTAINER=	lioux@FreeBSD.org
 
 USE_OPENSSL=	YES
 
-TLS_PATCH_DATE=	20000823
+TLS_PATCH_DATE=	20010627
 
 # Using default from master port, i.e., /var/qmail
 PREFIX?=	${QMAIL_PORT_PREFIX}
@@ -64,9 +63,9 @@ certificate:
 			${MKDIR} ${WRKDIR} ; \
 		fi ; \
 		${OPENSSLBASE}/bin/openssl req -new -x509 -nodes \
-			-out ${WRKDIR}/cert.pem -days 366 \
-			-keyout ${WRKDIR}/cert.pem ; \
-		${INSTALL} -o qmaild -g qmail -m 0640 ${WRKDIR}/cert.pem ${PREFIX}/control/cert.pem ; \
+			-out ${WRKDIR}/servercert.pem -days 366 \
+			-keyout ${WRKDIR}/servercert.pem ; \
+		${INSTALL} -o qmaild -g qmail -m 0640 ${WRKDIR}/servercert.pem ${PREFIX}/control/servercert.pem ; \
 		${ECHO_MSG} "===> Do not forget to do 'make clean' to clean up temporary files" ; \
 	else \
 		${ECHO_MSG} "===> You must create the file ${OPENSSLDIR}/openssl.cnf first." ; \
@@ -81,12 +80,12 @@ certificate-req:
 		fi ; \
 		${OPENSSLBASE}/bin/openssl req -new -nodes \
 			-out ${WRKDIR}/req.pem \
-			-keyout ${WRKDIR}/cert.pem ; \
-		${INSTALL} -o qmaild -g qmail -m 0640 ${WRKDIR}/cert.pem ${PREFIX}/control/cert.pem ; \
+			-keyout ${WRKDIR}/servercert.pem ; \
+		${INSTALL} -o qmaild -g qmail -m 0640 ${WRKDIR}/servercert.pem ${PREFIX}/control/servercert.pem ; \
 		${ECHO_MSG} ; \
 		${ECHO_MSG} "===> Do not forget to do 'make clean' to clean up temporary files" ; \
 		${ECHO_MSG} "===> Send ${WRKDIR}/req.pem to your CA to obtain signed_req.pem, and do:" ; \
-		${ECHO_MSG} "===> cat signed_req.pem >> ${PREFIX}/control/cert.pem" ; \
+		${ECHO_MSG} "===> cat signed_req.pem >> ${PREFIX}/control/servercert.pem" ; \
 	else \
 		${ECHO_MSG} "===> You must create the file ${OPENSSLDIR}/openssl.cnf first." ; \
 	fi
diff --git a/mail/qmail-tls/Makefile b/mail/qmail-tls/Makefile
index ac0c3a81af32..84f0e180bc62 100644
--- a/mail/qmail-tls/Makefile
+++ b/mail/qmail-tls/Makefile
@@ -7,7 +7,6 @@
 
 PORTNAME=	qmail
 PORTVERSION=	${QMAIL_VERSION}.${TLS_PATCH_DATE}
-PORTREVISION=	1
 CATEGORIES=	mail
 PKGNAMESUFFIX=	-tls
 
@@ -19,7 +18,7 @@ MAINTAINER=	lioux@FreeBSD.org
 
 USE_OPENSSL=	YES
 
-TLS_PATCH_DATE=	20000823
+TLS_PATCH_DATE=	20010627
 
 # Using default from master port, i.e., /var/qmail
 PREFIX?=	${QMAIL_PORT_PREFIX}
@@ -64,9 +63,9 @@ certificate:
 			${MKDIR} ${WRKDIR} ; \
 		fi ; \
 		${OPENSSLBASE}/bin/openssl req -new -x509 -nodes \
-			-out ${WRKDIR}/cert.pem -days 366 \
-			-keyout ${WRKDIR}/cert.pem ; \
-		${INSTALL} -o qmaild -g qmail -m 0640 ${WRKDIR}/cert.pem ${PREFIX}/control/cert.pem ; \
+			-out ${WRKDIR}/servercert.pem -days 366 \
+			-keyout ${WRKDIR}/servercert.pem ; \
+		${INSTALL} -o qmaild -g qmail -m 0640 ${WRKDIR}/servercert.pem ${PREFIX}/control/servercert.pem ; \
 		${ECHO_MSG} "===> Do not forget to do 'make clean' to clean up temporary files" ; \
 	else \
 		${ECHO_MSG} "===> You must create the file ${OPENSSLDIR}/openssl.cnf first." ; \
@@ -81,12 +80,12 @@ certificate-req:
 		fi ; \
 		${OPENSSLBASE}/bin/openssl req -new -nodes \
 			-out ${WRKDIR}/req.pem \
-			-keyout ${WRKDIR}/cert.pem ; \
-		${INSTALL} -o qmaild -g qmail -m 0640 ${WRKDIR}/cert.pem ${PREFIX}/control/cert.pem ; \
+			-keyout ${WRKDIR}/servercert.pem ; \
+		${INSTALL} -o qmaild -g qmail -m 0640 ${WRKDIR}/servercert.pem ${PREFIX}/control/servercert.pem ; \
 		${ECHO_MSG} ; \
 		${ECHO_MSG} "===> Do not forget to do 'make clean' to clean up temporary files" ; \
 		${ECHO_MSG} "===> Send ${WRKDIR}/req.pem to your CA to obtain signed_req.pem, and do:" ; \
-		${ECHO_MSG} "===> cat signed_req.pem >> ${PREFIX}/control/cert.pem" ; \
+		${ECHO_MSG} "===> cat signed_req.pem >> ${PREFIX}/control/servercert.pem" ; \
 	else \
 		${ECHO_MSG} "===> You must create the file ${OPENSSLDIR}/openssl.cnf first." ; \
 	fi
diff --git a/mail/qmail/distinfo b/mail/qmail/distinfo
index b5285cb5e866..7d7a2f22fbe5 100644
--- a/mail/qmail/distinfo
+++ b/mail/qmail/distinfo
@@ -2,7 +2,7 @@ MD5 (qmail-1.03.tar.gz) = 622f65f982e380dbe86e6574f3abcb7c
 MD5 (qmail-103.patch) = 9140ad2b03017145cd7963c84bb24f16
 MD5 (qmail-ldap-1.03-20011001a.patch.gz) = f20e0b7369cec4faddca5fbe1430005f
 MD5 (qmail-mysql-1.1.8.patch) = 0860a5b5cd5b6f99bf005e845b2e0764
-MD5 (tls.patch) = 00bb249d5275001a9c84fd8fab5c99a4
+MD5 (tls.patch) = 676a391f4c545c294823a1a41b3ef705
 MD5 (qmailqueue-patch) = fed4b56ffd1a5badebacc0ae4b9586ca
 MD5 (big-todo.103.patch) = 39b6f70f65056472ff97ab40c1dba7b4
 MD5 (big-concurrency.patch) = 2ff58c3570870a8ff9a1d9eb9aec05a6