diff --git a/mail/qmail/Makefile b/mail/qmail/Makefile
index 640cc34b422f..44accd3c7204 100644
--- a/mail/qmail/Makefile
+++ b/mail/qmail/Makefile
@@ -332,6 +332,15 @@ DISTFILES+=	qmail-smtpd-auth-${SMTP_AUTH_VERSION}.tar.gz:smtp_auth
 EXTRACT_ONLY+=	qmail-smtpd-auth-${SMTP_AUTH_VERSION}.tar.gz
 MASTER_SITES+=	http://tomclegg.net/qmail/:close3
 DISTFILES+=	qmail-smtpd-auth-close3.patch:close3
+. if defined(SLAVE_TLS)
+AUTH_PATCH=	auth.patch.diff-tls
+. elif defined(WITH_SPF_PATCH) && !defined(BARRIER_SPF_PATCH)
+AUTH_PATCH=	auth.patch.diff
+. endif
+
+. if defined(AUTH_PATCH)
+DISTFILES+=	${AUTH_PATCH}:smtp_auth
+. endif
 .endif
 
 .if defined(WITH_MAILDIRQUOTA_PATCH) && !defined(BARRIER_MAILDIRQUOTA_PATCH)
@@ -514,10 +523,8 @@ post-extract:
 post-patch:
 .if defined(WITH_SMTP_AUTH_PATCH) && !defined(BARRIER_SMTP_AUTH_PATCH)
 	@${CP} ${SMTP_AUTH_DIR}/base64.[ch] ${WRKSRC}
-. if defined(SLAVE_TLS)
-	@${PATCH} -d ${SMTP_AUTH_DIR} < ${FILESDIR}/auth.patch.patch-tls
-. elif defined(WITH_SPF_PATCH)
-	@${PATCH} -d ${SMTP_AUTH_DIR} < ${FILESDIR}/auth.patch.patch
+. if defined(AUTH_PATCH)
+	@${PATCH} -d ${SMTP_AUTH_DIR} < ${DISTDIR}/${DIST_SUBDIR}/${AUTH_PATCH}
 . endif
 	@${PATCH} -d ${WRKSRC} < ${SMTP_AUTH_DIR}/auth.patch
 . if defined(SLAVE_TLS) && defined(WITH_SPF_PATCH) && defined(SPF_TLS_PATCH)
diff --git a/mail/qmail/distinfo b/mail/qmail/distinfo
index 298bcd9f1d90..bd245c4f3a75 100644
--- a/mail/qmail/distinfo
+++ b/mail/qmail/distinfo
@@ -79,6 +79,12 @@ SIZE (qmail/ext_todo-20030105_spf.patch) = 33781
 MD5 (qmail/ext_todo-20030105_mysql.patch) = ecddff9ba6d725ec3be61843bc8007a7
 SHA256 (qmail/ext_todo-20030105_mysql.patch) = 3fc65b91faaaae147dbf6264f9381664819ef2f236532764309d174f29919ff1
 SIZE (qmail/ext_todo-20030105_mysql.patch) = 33797
-MD5 (qmail/qmail-spf-rc5.patch-spamcontrol) = 9fe79d3420c9ad75f7ec224e04933bf5
-SHA256 (qmail/qmail-spf-rc5.patch-spamcontrol) = 4c49eb9bb137fb6c07ef9a38773fc6d122a087b120f663c0fc9dc4910875e527
-SIZE (qmail/qmail-spf-rc5.patch-spamcontrol) = 64100
+MD5 (qmail/qmail-spf-rc5.patch-spamcontrol) = c7da17aa55896eae8c525d05c65387fd
+SHA256 (qmail/qmail-spf-rc5.patch-spamcontrol) = 52a3e4a6c8ae0124be280b6c0d183d81f4a6bd10c23fc735d99f4f731d4f5c6d
+SIZE (qmail/qmail-spf-rc5.patch-spamcontrol) = 64214
+MD5 (qmail/auth.patch.diff) = 23e0509061cd5dda4a1abf9a7cb7596d
+SHA256 (qmail/auth.patch.diff) = 1d0f8e0ce139cd00b86f056bc31c1422d30b88cb8b125023d534cc3664f827b8
+SIZE (qmail/auth.patch.diff) = 4412
+MD5 (qmail/auth.patch.diff-tls) = 7e706dd124deb9a25cecd91fe652a90b
+SHA256 (qmail/auth.patch.diff-tls) = 467c5f68d5d332d2400f937c76311e5358b613923d64e68ae98d51d178c7de5e
+SIZE (qmail/auth.patch.diff-tls) = 2993
diff --git a/mail/qmail/files/auth.patch.patch b/mail/qmail/files/auth.patch.patch
deleted file mode 100644
index bc35b45673ed..000000000000
--- a/mail/qmail/files/auth.patch.patch
+++ /dev/null
@@ -1,105 +0,0 @@
---- auth.patch.orig	Mon Dec 12 09:55:27 2005
-+++ auth.patch	Mon Dec 12 09:58:44 2005
-@@ -1,5 +1,5 @@
--*** Makefile.orig	Mon Jun 15 05:53:16 1998
----- Makefile	Fri May 10 00:31:38 2002
-+*** Makefile.orig	Mon Dec 12 09:37:18 2005
-+--- Makefile	Mon Dec 12 09:51:10 2005
- ***************
- *** 136,141 ****
- --- 136,145 ----
-@@ -14,52 +14,50 @@
-   binm1.sh conf-qmail
-   	cat binm1.sh \
- ***************
--*** 1536,1547 ****
--  timeoutwrite.o ip.o ipme.o ipalloc.o control.o constmap.o received.o \
--  date822fmt.o now.o qmail.o cdb.a fd.a wait.a datetime.a getln.a \
--  open.a sig.a case.a env.a stralloc.a alloc.a substdio.a error.a str.a \
--! fs.a auto_qmail.o socket.lib
-+*** 1597,1608 ****
-+  timeoutwrite.o ip.o ipme.o ipalloc.o strsalloc.o control.o constmap.o \
-+  received.o date822fmt.o now.o qmail.o spf.o dns.o cdb.a fd.a wait.a \
-+  datetime.a getln.a open.a sig.a case.a env.a stralloc.a alloc.a substdio.a \
-+! error.a str.a fs.a auto_qmail.o socket.lib dns.lib
-   	./load qmail-smtpd rcpthosts.o commands.o timeoutread.o \
--  	timeoutwrite.o ip.o ipme.o ipalloc.o control.o constmap.o \
--  	received.o date822fmt.o now.o qmail.o cdb.a fd.a wait.a \
--  	datetime.a getln.a open.a sig.a case.a env.a stralloc.a \
--! 	alloc.a substdio.a error.a str.a fs.a auto_qmail.o  `cat \
--  	socket.lib`
-+  	timeoutwrite.o ip.o ipme.o ipalloc.o strsalloc.o control.o \
-+  	constmap.o received.o date822fmt.o now.o qmail.o spf.o dns.o cdb.a \
-+  	fd.a wait.a datetime.a getln.a open.a sig.a case.a env.a stralloc.a \
-+! 	alloc.a substdio.a error.a fs.a auto_qmail.o \
-+  	str.a `cat socket.lib` `cat dns.lib`
-   
-   qmail-smtpd.0: \
----- 1540,1551 ----
--  timeoutwrite.o ip.o ipme.o ipalloc.o control.o constmap.o received.o \
--  date822fmt.o now.o qmail.o cdb.a fd.a wait.a datetime.a getln.a \
--  open.a sig.a case.a env.a stralloc.a alloc.a substdio.a error.a str.a \
--! fs.a auto_qmail.o base64.o socket.lib
-+--- 1601,1612 ----
-+  timeoutwrite.o ip.o ipme.o ipalloc.o strsalloc.o control.o constmap.o \
-+  received.o date822fmt.o now.o qmail.o spf.o dns.o cdb.a fd.a wait.a \
-+  datetime.a getln.a open.a sig.a case.a env.a stralloc.a alloc.a substdio.a \
-+! error.a str.a fs.a auto_qmail.o base64.o socket.lib dns.lib
-   	./load qmail-smtpd rcpthosts.o commands.o timeoutread.o \
--  	timeoutwrite.o ip.o ipme.o ipalloc.o control.o constmap.o \
--  	received.o date822fmt.o now.o qmail.o cdb.a fd.a wait.a \
--  	datetime.a getln.a open.a sig.a case.a env.a stralloc.a \
--! 	alloc.a substdio.a error.a str.a fs.a auto_qmail.o base64.o  `cat \
--  	socket.lib`
-+  	timeoutwrite.o ip.o ipme.o ipalloc.o strsalloc.o control.o \
-+  	constmap.o received.o date822fmt.o now.o qmail.o spf.o dns.o cdb.a \
-+  	fd.a wait.a datetime.a getln.a open.a sig.a case.a env.a stralloc.a \
-+! 	alloc.a substdio.a error.a fs.a auto_qmail.o base64.o \
-+  	str.a `cat socket.lib` `cat dns.lib`
-   
-   qmail-smtpd.0: \
- ***************
--*** 1553,1559 ****
-+*** 1614,1620 ****
-   substdio.h alloc.h auto_qmail.h control.h received.h constmap.h \
--  error.h ipme.h ip.h ipalloc.h ip.h gen_alloc.h ip.h qmail.h \
-+  error.h ipme.h ip.h ipalloc.h strsalloc.h ip.h gen_alloc.h ip.h qmail.h \
-   substdio.h str.h fmt.h scan.h byte.h case.h env.h now.h datetime.h \
--! exit.h rcpthosts.h timeoutread.h timeoutwrite.h commands.h
-+! exit.h rcpthosts.h timeoutread.h timeoutwrite.h commands.h spf.h
-   	./compile qmail-smtpd.c
-   
-   qmail-start: \
----- 1557,1564 ----
-+--- 1618,1625 ----
-   substdio.h alloc.h auto_qmail.h control.h received.h constmap.h \
--  error.h ipme.h ip.h ipalloc.h ip.h gen_alloc.h ip.h qmail.h \
-+  error.h ipme.h ip.h ipalloc.h strsalloc.h ip.h gen_alloc.h ip.h qmail.h \
-   substdio.h str.h fmt.h scan.h byte.h case.h env.h now.h datetime.h \
--! exit.h rcpthosts.h timeoutread.h timeoutwrite.h commands.h wait.h \
--! fd.h base64.h
-+! exit.h rcpthosts.h timeoutread.h timeoutwrite.h commands.h spf.h \
-+! wait.h fd.h base64.h
-   	./compile qmail-smtpd.c
-   
-   qmail-start: \
--
--
- *** TARGETS.orig	Mon Jun 15 05:53:16 1998
- --- TARGETS	Fri May 10 00:31:38 2002
- ***************
-@@ -143,11 +141,11 @@
- *** qmail-smtpd.c.orig	Mon Jun 15 05:53:16 1998
- --- qmail-smtpd.c	Fri May 10 00:33:35 2002
- ***************
--*** 23,29 ****
----- 23,32 ----
--  #include "timeoutread.h"
-+*** 24,30 ****
-+--- 24,33 ----
-   #include "timeoutwrite.h"
-   #include "commands.h"
-+  #include "spf.h"
- + #include "wait.h"
- + #include "fd.h"
-   
diff --git a/mail/qmail/files/auth.patch.patch-tls b/mail/qmail/files/auth.patch.patch-tls
deleted file mode 100644
index 751b0e815e93..000000000000
--- a/mail/qmail/files/auth.patch.patch-tls
+++ /dev/null
@@ -1,90 +0,0 @@
---- auth.patch.orig	Mon Dec 12 12:23:49 2005
-+++ auth.patch	Mon Dec 12 12:25:57 2005
-@@ -14,29 +14,31 @@
-   binm1.sh conf-qmail
-   	cat binm1.sh \
- ***************
--*** 1536,1547 ****
-+*** 1537,1549 ****
-   timeoutwrite.o ip.o ipme.o ipalloc.o control.o constmap.o received.o \
-   date822fmt.o now.o qmail.o cdb.a fd.a wait.a datetime.a getln.a \
-   open.a sig.a case.a env.a stralloc.a alloc.a substdio.a error.a str.a \
- ! fs.a auto_qmail.o socket.lib
-   	./load qmail-smtpd rcpthosts.o commands.o timeoutread.o \
-   	timeoutwrite.o ip.o ipme.o ipalloc.o control.o constmap.o \
-+  	tls.o ssl_timeoutio.o ndelay.a -L/usr/local/ssl/lib -lssl -lcrypto \
-   	received.o date822fmt.o now.o qmail.o cdb.a fd.a wait.a \
-   	datetime.a getln.a open.a sig.a case.a env.a stralloc.a \
- ! 	alloc.a substdio.a error.a str.a fs.a auto_qmail.o  `cat \
-   	socket.lib`
-   
-   qmail-smtpd.0: \
----- 1540,1551 ----
-+--- 1541,1553 ----
-   timeoutwrite.o ip.o ipme.o ipalloc.o control.o constmap.o received.o \
-   date822fmt.o now.o qmail.o cdb.a fd.a wait.a datetime.a getln.a \
-   open.a sig.a case.a env.a stralloc.a alloc.a substdio.a error.a str.a \
- ! fs.a auto_qmail.o base64.o socket.lib
-   	./load qmail-smtpd rcpthosts.o commands.o timeoutread.o \
-   	timeoutwrite.o ip.o ipme.o ipalloc.o control.o constmap.o \
-+  	tls.o ssl_timeoutio.o ndelay.a -L/usr/local/ssl/lib -lssl -lcrypto \
-   	received.o date822fmt.o now.o qmail.o cdb.a fd.a wait.a \
-   	datetime.a getln.a open.a sig.a case.a env.a stralloc.a \
--! 	alloc.a substdio.a error.a str.a fs.a auto_qmail.o base64.o  `cat \
-+! 	alloc.a substdio.a error.a str.a fs.a auto_qmail.o base64.o `cat \
-   	socket.lib`
-   
-   qmail-smtpd.0: \
-@@ -174,30 +176,40 @@
-   stralloc greeting = {0};
-   
- ***************
--*** 229,235 ****
--  }
-+*** 265,272 ****
-   void smtp_ehlo(arg) char *arg;
-   {
--!   smtp_greet("250-"); out("\r\n250-PIPELINING\r\n250 8BITMIME\r\n");
-+    smtp_greet("250-");
-+  #ifdef TLS
-+!   if (!ssl) out("\r\n250-STARTTLS");
-+  #endif
-+    out("\r\n250-PIPELINING\r\n250 8BITMIME\r\n");
-     seenmail = 0; dohelo(arg);
--  }
--  void smtp_rset()
----- 241,255 ----
--  }
-+--- 277,300 ----
-   void smtp_ehlo(arg) char *arg;
-   {
--!   smtp_greet("250-");
--! #ifdef AUTHCRAM
-+    smtp_greet("250-");
-++ #ifdef AUTHCRAM
-+  #ifdef TLS
-+!   out("\r\n250-AUTH LOGIN CRAM-MD5 PLAIN");
-+!   out("\r\n250-AUTH=LOGIN CRAM-MD5 PLAIN");
-+!   if (!ssl) out("\r\n250-STARTTLS");
-+! #else
- !   out("\r\n250-AUTH LOGIN CRAM-MD5 PLAIN");
- !   out("\r\n250-AUTH=LOGIN CRAM-MD5 PLAIN");
-+! #endif
-+! #else
-+! #ifdef TLS
-+!   out("\r\n250-AUTH LOGIN PLAIN");
-+!   out("\r\n250-AUTH=LOGIN PLAIN");
-+!   if (!ssl) out("\r\n250-STARTTLS");
- ! #else
- !   out("\r\n250-AUTH LOGIN PLAIN");
- !   out("\r\n250-AUTH=LOGIN PLAIN");
- ! #endif
--!   out("\r\n250-PIPELINING\r\n250 8BITMIME\r\n");
-+  #endif
-+    out("\r\n250-PIPELINING\r\n250 8BITMIME\r\n");
-     seenmail = 0; dohelo(arg);
--  }
--  void smtp_rset()
- ***************
- *** 394,403 ****
- --- 414,639 ----