diff --git a/NEWS b/NEWS
index ccfbc1a63e1e7df68937c3f41dfe67b8c1ee76db..4069c131f34aedf56816e76e37ba399103de0513 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,10 @@
 Here is a history of user visible changes to Python milter.
 
 0.8.4	Auto-whitelist recipients of outgoing email.
+	Fix SPF policy via sendmail access map (case insensitive keys).
+	Train screener on whitelisted messages
+	Optional idx parameter to addheader to invoke smfi_insheader
+	Activate progress API when SMFIR_PROGRESS defined
 0.8.3   Keep screened honeypot mail, but optionally discard honeypot only mail.
 	spf_accept_fail option for braindead SPF senders 
 	  (treats fail like softfail)
diff --git a/bms.py b/bms.py
index 4bcb6a3e4b682bb05ddfaa894467e096d832d1c1..819667af3d36aa10d4b078a3eda740ed75acf61d 100644
--- a/bms.py
+++ b/bms.py
@@ -1,6 +1,9 @@
 #!/usr/bin/env python
 # A simple milter that has grown quite a bit.
 # $Log$
+# Revision 1.35  2005/10/20 18:47:27  customdesigned
+# Configure auto_whitelist senders.
+#
 # Revision 1.34  2005/10/19 21:07:49  customdesigned
 # access.db stores keys in lower case
 #
@@ -1233,8 +1236,9 @@ class bmsMilter(Milter.Milter):
       msg = rfc822.Message(self.fp)
       for rn,hf in msg.getaddrlist('from')+msg.getaddrlist('sender'):
 	t = parse_addr(hf)
-	if len(t) == 2 and t[1].lower() == mf_domain:
-	  break
+	if len(t) == 2:
+	  hd = t[1].lower()
+	  if hd == mf_domain or mf_domain.endswith('.'+hd): break
       else:
 	for f in msg.getallmatchingheaders('from'):
 	  self.log(f)
diff --git a/milter.html b/milter.html
index 4e52bd0836272dd4994ad44c5939047667a87f3f..d2298c2b9ae2283227055cc846daf3471740edfd 100644
--- a/milter.html
+++ b/milter.html
@@ -24,7 +24,7 @@ ALT="Viewable With Any Browser" BORDER="0"></A>
   Stuart D. Gathman</a><br>
 This web page is written by Stuart D. Gathman<br>and<br>sponsored by
 <a href="http://www.bmsi.com">Business Management Systems, Inc.</a> <br>
-Last updated Oct 12, 2005</h4>
+Last updated Oct 20, 2005</h4>
 
 See the <a href="faq.html">FAQ</a> | <a href="http://sourceforge.net/project/showfiles.php?group_id=139894">Download now</a> |
 <a href="/mailman/listinfo/pymilter">Subscribe to mailing list</a> |
@@ -51,6 +51,13 @@ Python milter has been moved to
 <a href="http://sourceforge.net/projects/pymilter/">pymilter Sourceforge
 project</a> for development and release downloads.
 <p>
+Release 0.8.4 makes configuring SPF policy via access.db actually work.
+The honeypot idea is enhanced by auto-whitelisting recipients of
+email sent from selected domains.  Whitelisted messages are then used
+to train the honeypot.  This makes the honeypot screener entirely self
+training.  The smfi_progress() API is now automatically supported when present.
+An optional idx parameter to milter.addheader() invokes smfi_insheader().
+<p>
 Release 0.8.3 uses the standard logging module, and supports configuring
 more detailed SPF policy via the sendmail access map.  SMTP AUTH connections
 are considered INTERNAL.  Preventing forgery between internal domains is
diff --git a/milter.rc b/milter.rc
index cd43cf915d467ca6143e910022d1ebc6a59a23b3..aca5845e4b088e3f3e1609055b9d0ca1ad08c614 100755
--- a/milter.rc
+++ b/milter.rc
@@ -5,7 +5,7 @@
 # chkconfig: 2345 80 30
 # description: Milter is a process that filters messages sent through sendmail.
 # processname: milter
-# config: /var/log/milter/bms.py
+# config: /etc/mail/pymilter.cfg
 # pidfile: /var/run/milter/milter.pid
 
 python="python2.3"
diff --git a/milter.rc7 b/milter.rc7
index 5445ca2ec1b2f97f2142b1b6c737119b4af2adb2..21931b62b24b598de91816f4e9e4201c6efd65c8 100755
--- a/milter.rc7
+++ b/milter.rc7
@@ -5,7 +5,7 @@
 # chkconfig: 2345 80 30
 # description: Milter is a process that filters messages sent through sendmail.
 # processname: milter
-# config: /var/log/milter/bms.py
+# config: /etc/mail/pymilter.cfg
 # pidfile: /var/run/milter/milter.pid
 
 python="python2.3"
diff --git a/milter.spec b/milter.spec
index 0187d50646773ab6dc66683ca80009e0e674407b..446305b0480319b52a8bff775c4edc2a02d0ecb0 100644
--- a/milter.spec
+++ b/milter.spec
@@ -55,7 +55,7 @@ modules provide for navigating and modifying MIME parts.
 #%patch -p1
 
 %build
-env CFLAGS="$RPM_OPT_FLAGS" %{python} setup.py build
+env CFLAGS="$RPM_OPT_FLAGS" LDFLAGS="-s" %{python} setup.py build
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -169,6 +169,8 @@ rm -rf $RPM_BUILD_ROOT
 /usr/share/sendmail-cf/hack/rhsbl.m4
 
 %changelog
+* Fri Oct 21 2005 Stuart Gathman <stuart@bmsi.com> 0.8.4-2
+- Don't supply sender when MFROM is subdomain of header from/sender.
 * Thu Oct 20 2005 Stuart Gathman <stuart@bmsi.com> 0.8.4-1
 - Fix SPF policy via sendmail access map (case insensitive keys).
 - Auto whitelist senders, train screener on whitelisted messages