diff -Nru dovecot-1.2.12/debian/changelog dovecot-1.2.12/debian/changelog
--- dovecot-1.2.12/debian/changelog	2010-09-27 08:48:05.000000000 -0700
+++ dovecot-1.2.12/debian/changelog	2010-09-28 14:44:35.000000000 -0700
@@ -1,3 +1,10 @@
+dovecot (1:1.2.12-1ubuntu7) maverick; urgency=low
+
+  * debian/patches/mail-stack-dovecot.conf:
+    - include additional configuration (LP: #649574)
+
+ -- Ante Karamatic <ivoks@ubuntu.com>  Tue, 28 Sep 2010 14:31:59 -0700
+
 dovecot (1:1.2.12-1ubuntu6) maverick; urgency=low
 
   * debian/dovecot-common.dovecot.upstart: Fix for non-starting upstart job (LP: #646858) 
diff -Nru dovecot-1.2.12/debian/patches/mail-stack-dovecot.conf dovecot-1.2.12/debian/patches/mail-stack-dovecot.conf
--- dovecot-1.2.12/debian/patches/mail-stack-dovecot.conf	1969-12-31 16:00:00.000000000 -0800
+++ dovecot-1.2.12/debian/patches/mail-stack-dovecot.conf	2010-09-28 14:30:54.000000000 -0700
@@ -0,0 +1,20 @@
+Index: dovecot-1.2.12/dovecot-example.conf
+===================================================================
+--- dovecot-1.2.12.orig/dovecot-example.conf	2010-09-28 14:30:49.619945005 -0700
++++ dovecot-1.2.12/dovecot-example.conf	2010-09-28 14:30:46.835945004 -0700
+@@ -1136,6 +1136,7 @@
+       #mode = 0660
+     #}
+   #}
++  !include_try /etc/dovecot/auth.d/*.auth
+ }
+ 
+ # If you wish to use another authentication server than dovecot-auth, you can
+@@ -1276,6 +1277,6 @@
+ }
+ 
+ # Config files can also be included. deliver doesn't support them currently.
+-#!include /etc/dovecot/conf.d/*.conf
++!include_try /etc/dovecot/conf.d/*.conf
+ # Optional configurations, don't give an error if it's not found:
+ #!include_try /etc/dovecot/extra.conf
diff -Nru dovecot-1.2.12/debian/patches/series dovecot-1.2.12/debian/patches/series
--- dovecot-1.2.12/debian/patches/series	2010-09-24 09:21:28.000000000 -0700
+++ dovecot-1.2.12/debian/patches/series	2010-09-28 14:29:53.000000000 -0700
@@ -9,3 +9,4 @@
 dovecot-mboxlocking.patch
 fix-dovecot-config-parser.patch
 fix-mbox-autodetection.patch
+mail-stack-dovecot.conf