3 files changed, 28 insertions, 4 deletions

diff --git a/etc/ChangeLog b/etc/ChangeLog
index 7ebb2a751ab..367f7c63264 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,9 @@
+2013-03-02  Bill Wohler  <wohler@newt.com>
+
+        Release MH-E version 8.5.
+
+        * NEWS, MH-E-NEWS: Update for MH-E release 8.5.
+
 2013-03-02  Paul Eggert  <eggert@cs.ucla.edu>
 
         * NEWS: The lock for FILE is now .#FILE or .#-FILE (Bug#13807).
diff --git a/etc/MH-E-NEWS b/etc/MH-E-NEWS
index 846504c9014..c35eb72e8d9 100644
--- a/etc/MH-E-NEWS
+++ b/etc/MH-E-NEWS
@@ -3,6 +3,25 @@
 Copyright (C) 2001-2013 Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
+* Changes in MH-E 8.5
+
+Version 8.5 fixes bugs when incorporating or forwarding mail.
+
+** Bug Fixes in MH-E 8.5
+
+*** mh-rmail doesn't switch to +inbox
+
+The function `mh-rmail' now switches to `+inbox' as expected (closes
+SF #271).
+
+*** Problem forwarding a message
+
+Forwarding messages resulted in the error: `(wrong-type-argument
+number-or-marker-p nil).' This has been fixed by setting the mail
+separator (closes SF #270).
+
+
+
 * Changes in MH-E 8.4
 
 Version 8.4 postpones junk processing and merges in your components
@@ -986,7 +1005,7 @@ Renamed from `mh-speedbar-selected-folder-face' per new Emacs conventions.
 *** mh-speedbar-selected-folder-with-unseen-messages
 
 Renamed from `mh-speedbar-selected-folder-with-unseen-messages-face'
-per new Emacs conventions. 
+per new Emacs conventions.
 
 
 
@@ -1099,7 +1118,7 @@ Emacs conventions.
 
 *** Face Variable Names Now Follow Current Conventions
 
-The -face suffix has been dropped from all face names. 
+The -face suffix has been dropped from all face names.
 
 *** Swish Fixes
 
@@ -3360,4 +3379,3 @@ Local variables:
 mode: outline
 paragraph-separate: "[  ]*$"
 end:
-
diff --git a/etc/NEWS b/etc/NEWS
index 73f7991823f..8ae8ae3bf16 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -159,7 +159,7 @@ callers to fit the image to a frame other than the selected frame.
 *** `C-x 8 RET' in Isearch mode reads a character by its Unicode name
 and adds it to the search string.
 
-** MH-E has been updated to MH-E version 8.4.
+** MH-E has been updated to MH-E version 8.5.
 See MH-E-NEWS for details.
 
 ---