diff -u amavisd-new-2.6.5/debian/amavisd-new-postfix.postinst amavisd-new-2.6.5/debian/amavisd-new-postfix.postinst
--- amavisd-new-2.6.5/debian/amavisd-new-postfix.postinst
+++ amavisd-new-2.6.5/debian/amavisd-new-postfix.postinst
@@ -39,7 +39,7 @@
 			if which postconf >/dev/null; then
 				# Setup postfix
 				set_postfix_option "content_filter = smtp-amavis:[localhost]:10024"
-				set_postfix_option "spf-policyd_time_limit = 3600s"
+				set_postfix_option "policy-spf_time_limit = 3600s"
 				SMTPD_RECIP_RESTR=`postconf smtpd_recipient_restrictions`
 				set_postfix_option "$SMTPD_RECIP_RESTR, check_policy_service unix:private/policy-spf"
 			fi
@@ -47,6 +47,11 @@
 		postfix-add-policy policy-spf nobody /usr/bin/policyd-spf
 		postfix-add-filter smtp-amavis 10025
 		fi
+		if [ ! -z "$2" ] && dpkg --compare-versions $2 lt 1:2.6.5-0ubuntu3.2; then
+			# Fix incorrect parameter (LP: #996569)
+			set_postfix_option "policy-spf_time_limit = 3600s"
+			sed -i "/^spf-policyd_time_limit/d" /etc/postfix/main.cf
+		fi
        else
                 echo ""
                 echo "Postfix not configured. Run"
diff -u amavisd-new-2.6.5/debian/changelog amavisd-new-2.6.5/debian/changelog
--- amavisd-new-2.6.5/debian/changelog
+++ amavisd-new-2.6.5/debian/changelog
@@ -1,3 +1,10 @@
+amavisd-new (1:2.6.5-0ubuntu3.2) precise-proposed; urgency=low
+
+  * Replace incorrect parameter 'spf-policyd_time_limit' with a
+    correct 'policy-spf_time_limit' (LP: #996569)
+
+ -- Ante Karamatic <ivoks@ubuntu.com>  Sun, 29 Jul 2012 10:55:26 +0200
+
 amavisd-new (1:2.6.5-0ubuntu3.1) precise-proposed; urgency=low
 
   * Fix init script so that 'service amavisd restart' works (LP: #930916):