diff -u amavisd-new-2.6.1.dfsg/debian/changelog amavisd-new-2.6.1.dfsg/debian/changelog
--- amavisd-new-2.6.1.dfsg/debian/changelog
+++ amavisd-new-2.6.1.dfsg/debian/changelog
@@ -1,3 +1,10 @@
+amavisd-new (1:2.6.1.dfsg-2ubuntu1.1) intrepid-proposed; urgency=low
+
+  * Drop settings from /etc/amavis/conf.d/21-ubuntu_defaults that could cause
+    backscatter in the default configuration (LP: #306889)
+
+ -- Scott Kitterman <scott@kitterman.com>  Wed, 10 Dec 2008 14:00:33 -0500
+
 amavisd-new (1:2.6.1.dfsg-2ubuntu1) intrepid; urgency=low
 
   * Merge from debian unstable, remaining changes:
diff -u amavisd-new-2.6.1.dfsg/debian/etc/conf.d/21-ubuntu_defaults amavisd-new-2.6.1.dfsg/debian/etc/conf.d/21-ubuntu_defaults
--- amavisd-new-2.6.1.dfsg/debian/etc/conf.d/21-ubuntu_defaults
+++ amavisd-new-2.6.1.dfsg/debian/etc/conf.d/21-ubuntu_defaults
@@ -12,8 +12,6 @@
 $final_spam_destiny       = D_DISCARD;  # (defaults to D_REJECT)
 $final_bad_header_destiny = D_PASS;  # (defaults to D_PASS), D_BOUNCE suggested
 
-$warnbannedsender = 1;
-$warnbadhsender = 1;
 $virus_admin = undef;
 $spam_admin = undef;