diff -Nru dovecot-2.1.7/debian/changelog dovecot-2.1.7/debian/changelog
--- dovecot-2.1.7/debian/changelog  2012-06-11 13:12:03.000000000 +0200
+++ dovecot-2.1.7/debian/changelog  2012-07-29 11:40:33.000000000 +0200
@@ -1,3 +1,10 @@
+dovecot (1:2.1.7-1ubuntu2) quantal; urgency=low
+
+  * Change configuration file for LDA on new installs and upgrades
+    (LP: #671065)
+
+ -- Ante Karamatic <ivoks@ubuntu.com>  Sun, 29 Jul 2012 11:39:21 +0200
+
 dovecot (1:2.1.7-1ubuntu1) quantal; urgency=low
 
   * Merge from Debian unstable, remaining changes:
diff -Nru dovecot-2.1.7/debian/mail-stack-delivery.postinst dovecot-2.1.7/debian/mail-stack-delivery.postinst
--- dovecot-2.1.7/debian/mail-stack-delivery.postinst   2012-06-10 10:06:23.000000000 +0200
+++ dovecot-2.1.7/debian/mail-stack-delivery.postinst   2012-07-29 11:42:13.000000000 +0200
@@ -45,7 +45,7 @@
                        set_postfix_option "broken_sasl_auth_clients = yes"
                        set_postfix_option "smtpd_recipient_restrictions = reject_unknown_sender_domain, reject_unknown_recipient_domain, reject_unauth_pipelining, permit_mynetworks, permit_sasl_authenticated, reject_unauth_destination"
                        set_postfix_option "smtpd_sender_restrictions = reject_unknown_sender_domain"
-                       set_postfix_option "mailbox_command = /usr/lib/dovecot/deliver -c /etc/dovecot/conf.d/01-mail-stack-delivery.conf -m \"\${EXTENSION}\""
+                       set_postfix_option "mailbox_command = /usr/lib/dovecot/deliver -c /etc/dovecot/dovecot.conf -m \"\${EXTENSION}\""
                        set_postfix_option "smtpd_tls_cert_file = /etc/ssl/certs/ssl-mail.pem"
                        set_postfix_option "smtpd_tls_key_file = /etc/ssl/private/ssl-mail.key"
                        set_postfix_option "smtpd_use_tls = yes"
@@ -58,6 +58,10 @@
                echo ' done.'
            fi
        fi
+       # Parameters that need to be changed on upgrades
+       if [ ! -z "$2" ] && dpkg --compare-versions $2 lt 1:2.1.7-1ubuntu2; then
+           set_postfix_option "mailbox_command = /usr/lib/dovecot/deliver -c /etc/dovecot/dovecot.conf -m \"\${EXTENSION}\""
+       fi
    else
        echo ""
        echo "Postfix not configured. Run"