diff --git a/mail/qmail/errno.patch b/mail/qmail/errno.diff
similarity index 95%
rename from mail/qmail/errno.patch
rename to mail/qmail/errno.diff
index dbdbe30c6..00b223520 100644
--- a/mail/qmail/errno.patch
+++ b/mail/qmail/errno.diff
@@ -1,7 +1,8 @@
 # --- SDE-COPYRIGHT-NOTE-BEGIN ---
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 #
-# Filename: package/.../qmail/errno.patch
+# Filename: package/.../qmail/errno.diff
+# Copyright (C) 2013 The OpenSDE Project
 # Copyright (C) 2004 - 2006 The T2 SDE Project
 #
 # More information can be found in the files COPYING and README.
diff --git a/mail/qmail/hotfixes.patch b/mail/qmail/hotfixes.diff
similarity index 98%
rename from mail/qmail/hotfixes.patch
rename to mail/qmail/hotfixes.diff
index ce8b061e8..1bff37303 100644
--- a/mail/qmail/hotfixes.patch
+++ b/mail/qmail/hotfixes.diff
@@ -1,7 +1,8 @@
 # --- SDE-COPYRIGHT-NOTE-BEGIN ---
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 #
-# Filename: package/.../qmail/hotfixes.patch
+# Filename: package/.../qmail/hotfixes.diff
+# Copyright (C) 2013 The OpenSDE Project
 # Copyright (C) 2004 - 2006 The T2 SDE Project
 #
 # More information can be found in the files COPYING and README.
diff --git a/mail/qmail/qmail.conf b/mail/qmail/qmail.conf
index a71522475..9b0ee2ccd 100644
--- a/mail/qmail/qmail.conf
+++ b/mail/qmail/qmail.conf
@@ -108,4 +108,13 @@ createdoc=0
 [ "$SDECFG_PKG_QMAIL_QUEUE" == "1" ] && var_append patchfiles ' ' "$( match_source_file -p qmailqueue )"
 [ "$SDECFG_PKG_QMAIL_QMTP" == "1" ] && var_append patchfiles ' ' "$( match_source_file -p qmtpc )"
 [ "$SDECFG_PKG_QMAIL_HOLD" == "1" ] && var_append patchfiles ' ' "$( match_source_file -p hold )"
-[ "$SDECFG_PKG_QMAIL_MILKYPATCH" == "1" ] && var_append patchfiles ' ' "$( match_source_file -p milky )"
+
+if [ "$SDECFG_PKG_QMAIL_MILKYPATCH" == "1" ]; then
+	var_append patchfiles ' ' "$( match_source_file -p milky )"
+	pkg_qmail_no_local_patches=true
+fi
+
+if [ ! $pkg_qmail_no_local_patches ]; then
+	var_append patchfiles ' ' "$confdir/errno.diff"
+	var_append patchfiles ' ' "$confdir/hotfixes.diff"
+fi