diff --git a/Milter/__init__.py b/Milter/__init__.py
index 4a2e9d419464622afd5e108e788bcafee1c113f0..f289636c306cbcc1a21b4fc7c603619eaa2634d9 100755
--- a/Milter/__init__.py
+++ b/Milter/__init__.py
@@ -16,7 +16,7 @@ from milter import ACCEPT,CONTINUE,REJECT,DISCARD,TEMPFAIL,	\
 try: from milter import QUARANTINE
 except: pass
 
-__version__ = '0.8.4'
+__version__ = '0.8.5'
 
 _seq_lock = thread.allocate_lock()
 _seq = 0
diff --git a/NEWS b/NEWS
index 4069c131f34aedf56816e76e37ba399103de0513..05b1baf9800352a125e9a2a031fc8f67244b0cf4 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,14 @@
 Here is a history of user visible changes to Python milter.
 
+0.8.5	Simple trusted_forwarder implementation.
+	Fix access_file neutral policy
+	Move Received-SPF header to beginning of headers
+	Supply keyword info for all results in Received-SPF header.
+	Move guessed SPF result to separate header
+	Activate smfi_insheader only when SMFIR_INSHEADER defined
+	Handle NULL MX in spf.py
+	in-process GOSSiP server support (to be extended later)
+	Expire CBV cache and renew auto-whitelist entries
 0.8.4	Auto-whitelist recipients of outgoing email.
 	Fix SPF policy via sendmail access map (case insensitive keys).
 	Train screener on whitelisted messages
diff --git a/milter.spec b/milter.spec
index cc8294c348378d736d81ce2669bed26fcdbc1ffc..1f59d91d24706d26b78ba36efb4ca3ed9dd0a5ca 100644
--- a/milter.spec
+++ b/milter.spec
@@ -1,5 +1,5 @@
 %define name milter
-%define version 0.8.4
+%define version 0.8.5
 %define release 2.RH7
 # what version of RH are we building for?
 %define redhat9 0
@@ -174,9 +174,16 @@ rm -rf $RPM_BUILD_ROOT
 /usr/share/sendmail-cf/hack/rhsbl.m4
 
 %changelog
-* Mon Oct 31 2005 Stuart Gathman <stuart@bmsi.com> 0.8.5-1
+* Thu Dec 29 2005 Stuart Gathman <stuart@bmsi.com> 0.8.5-1
 - Simple trusted_forwarder implementation.
 - Fix access_file neutral policy
+- Move Received-SPF header to beginning of headers
+- Supply keyword info for all results in Received-SPF header.
+- Move guessed SPF result to separate header
+- Activate smfi_insheader only when SMFIR_INSHEADER defined
+- Handle NULL MX in spf.py
+- in-process GOSSiP server support (to be extended later)
+- Expire CBV cache and renew auto-whitelist entries
 * 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.
 - Don't send quarantine DSN for DSNs
diff --git a/setup.py b/setup.py
index 09f92e6e8c70004dedb21ce964ab93bef24b5071..2e8000f7d03d915ee74fa66a4857780269fbda3f 100644
--- a/setup.py
+++ b/setup.py
@@ -1,7 +1,6 @@
 import os
 import sys
 from distutils.core import setup, Extension
-import Milter
 
 # FIXME: on some versions of sendmail, smutil is renamed to sm
 libs = ["milter", "smutil"]
@@ -13,7 +12,8 @@ if sys.version < '2.2.3':
   DistributionMetadata.classifiers = None
   DistributionMetadata.download_url = None
 
-setup(name = "milter", version = Milter.__version__,
+# NOTE: importing Milter to obtain version fails when milter.so not built
+setup(name = "milter", version = '0.8.5',
 	description="Python interface to sendmail milter API",
 	long_description="""\
 This is a python extension module to enable python scripts to