diff --git a/core/java/src/net/i2p/CoreVersion.java b/core/java/src/net/i2p/CoreVersion.java
index 230f55eaea..4039caa821 100644
--- a/core/java/src/net/i2p/CoreVersion.java
+++ b/core/java/src/net/i2p/CoreVersion.java
@@ -16,7 +16,7 @@ package net.i2p;
 public class CoreVersion {
     /** deprecated */
     public final static String ID = "Monotone";
-    public final static String VERSION = "0.8.4";
+    public final static String VERSION = "0.8.5";
 
     public static void main(String args[]) {
         System.out.println("I2P Core version: " + VERSION);
diff --git a/history.txt b/history.txt
index 20924cd6d9..2f9cfc8c7d 100644
--- a/history.txt
+++ b/history.txt
@@ -1,3 +1,5 @@
+* 2011-04-18  0.8.5 released
+
 2011-04-11 zzz
     * Console: Hide iframe on mobile browsers
     * DataHelper: Speed up eq() (Ticket #437)
diff --git a/installer/install.xml b/installer/install.xml
index 40a6e59c82..2f2e03f470 100644
--- a/installer/install.xml
+++ b/installer/install.xml
@@ -4,7 +4,7 @@
 
     <info>
         <appname>i2p</appname>
-        <appversion>0.8.4</appversion>
+        <appversion>0.8.5</appversion>
         <authors>
             <author name="I2P" email="http://forum.i2p2.de/"/>
         </authors>
diff --git a/installer/resources/news.xml b/installer/resources/news.xml
index c8a740085c..9006e0c8e4 100644
--- a/installer/resources/news.xml
+++ b/installer/resources/news.xml
@@ -1,12 +1,11 @@
 <!--
-<i2p.news date="$Date: 2011-03-02 00:00:00 $">
-<i2p.release version="0.8.4" date="2011/03/02" minVersion="0.6" />
+<i2p.news date="$Date: 2011-04-18 00:00:00 $">
+<i2p.release version="0.8.5" date="2011/04/18" minVersion="0.6" />
 -->
 <div lang="en">
-<h3>2011-03-02: <b>0.8.4 <a href="http://www.i2p2.i2p/release-0.8.4.html">Released</a></b></h3>
+<h3>2011-04-18: <b>0.8.5 <a href="http://www.i2p2.i2p/release-0.8.5.html">Released</a></b></h3>
 <p>
-The 0.8.4 release contains some performance improvements and important bug fixes.
-Also, i2psnark now supports magnet links.
+The 0.8.5 release contains a few bug fixes and performance improvements, and lots of translation updates.
 As usual, upgrading is recommended.
 </p><p>
 Please help grow the network.
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index f2522cd4ed..a411b00998 100644
--- a/router/java/src/net/i2p/router/RouterVersion.java
+++ b/router/java/src/net/i2p/router/RouterVersion.java
@@ -18,7 +18,7 @@ public class RouterVersion {
     /** deprecated */
     public final static String ID = "Monotone";
     public final static String VERSION = CoreVersion.VERSION;
-    public final static long BUILD = 9;
+    public final static long BUILD = 0;
 
     /** for example "-test" */
     public final static String EXTRA = "";
diff --git a/router/java/src/net/i2p/router/peermanager/ProfilePersistenceHelper.java b/router/java/src/net/i2p/router/peermanager/ProfilePersistenceHelper.java
index e278063aa5..af0167f20a 100644
--- a/router/java/src/net/i2p/router/peermanager/ProfilePersistenceHelper.java
+++ b/router/java/src/net/i2p/router/peermanager/ProfilePersistenceHelper.java
@@ -28,9 +28,9 @@ import net.i2p.util.SecureFileOutputStream;
 /**
  *  Write profiles to disk at shutdown,
  *  read at startup.
- *  The files are gzip compressed, however we unfortunately store them
- *  with a ".dat" extension instead of ".txt.gz", so it isn't apparent.
- *  TODO: Migrate to new extension.
+ *  The files are gzip compressed, we previously stored them
+ *  with a ".dat" extension instead of ".txt.gz", so it wasn't apparent.
+ *  Now migrated to a ".txt.gz" extension.
  */
 class ProfilePersistenceHelper {
     private final Log _log;