diff --git a/core/java/src/net/i2p/CoreVersion.java b/core/java/src/net/i2p/CoreVersion.java
index 87b002c08f..e98f28742d 100644
--- a/core/java/src/net/i2p/CoreVersion.java
+++ b/core/java/src/net/i2p/CoreVersion.java
@@ -15,7 +15,7 @@ package net.i2p;
  */
 public class CoreVersion {
     public final static String ID = "$Revision: 1.72 $ $Date: 2008-08-24 12:00:00 $";
-    public final static String VERSION = "0.6.3";
+    public final static String VERSION = "0.6.4";
 
     public static void main(String args[]) {
         System.out.println("I2P Core version: " + VERSION);
diff --git a/history.txt b/history.txt
index 16ecceaf76..1e97434d2f 100644
--- a/history.txt
+++ b/history.txt
@@ -1,3 +1,8 @@
+* 2008-10-05  0.6.4 released
+
+2008-10-05 Complication
+    * Update versions, package release
+
 2008-09-29 zzz
     * i2psnark: Add codevoid link, remove mastertracker
 
diff --git a/initialNews.xml b/initialNews.xml
index 1a9faeaeab..e7ec94b279 100644
--- a/initialNews.xml
+++ b/initialNews.xml
@@ -1,5 +1,5 @@
-<i2p.news date="$Date: 2008-08-24 12:00:00 $">
- <i2p.release version="0.6.3" date="2008/08/24" minVersion="0.6"
+<i2p.news date="$Date: 2008-10-05 12:00:00 $">
+ <i2p.release version="0.6.4" date="2008/10/05" minVersion="0.6"
             />
 <center><h2>Congratulations on getting I2P installed!</h2></center>
 <ul>
diff --git a/installer/install.xml b/installer/install.xml
index 0135bcf196..e609603dcb 100644
--- a/installer/install.xml
+++ b/installer/install.xml
@@ -4,7 +4,7 @@
 
     <info>
         <appname>i2p</appname>
-        <appversion>0.6.3</appversion>
+        <appversion>0.6.4</appversion>
         <authors>
             <author name="I2P" email="http://forum.i2p2.de/"/>
         </authors>
diff --git a/news.xml b/news.xml
index 32f73b6e9d..a34bf73502 100644
--- a/news.xml
+++ b/news.xml
@@ -1,5 +1,5 @@
-<i2p.news date="$Date: 2008-08-24 12:00:00 $">
- <i2p.release version="0.6.3" date="2008/08/24" minVersion="0.6"
+<i2p.news date="$Date: 2008-10-05 12:00:00 $">
+ <i2p.release version="0.6.4" date="2008/10/05" minVersion="0.6"
               anonurl="http://i2p/NF2RLVUxVulR3IqK0sGJR0dHQcGXAzwa6rEO4WAWYXOHw-DoZhKnlbf1nzHXwMEJoex5nFTyiNMqxJMWlY54cvU~UenZdkyQQeUSBZXyuSweflUXFqKN-y8xIoK2w9Ylq1k8IcrAFDsITyOzjUKoOPfVq34rKNDo7fYyis4kT5bAHy~2N1EVMs34pi2RFabATIOBk38Qhab57Umpa6yEoE~rbyR~suDRvD7gjBvBiIKFqhFueXsR2uSrPB-yzwAGofTXuklofK3DdKspciclTVzqbDjsk5UXfu2nTrC1agkhLyqlOfjhyqC~t1IXm-Vs2o7911k7KKLGjB4lmH508YJ7G9fLAUyjuB-wwwhejoWqvg7oWvqo4oIok8LG6ECR71C3dzCvIjY2QcrhoaazA9G4zcGMm6NKND-H4XY6tUWhpB~5GefB3YczOqMbHq4wi0O9MzBFrOJEOs3X4hwboKWANf7DT5PZKJZ5KorQPsYRSq0E3wSOsFCSsdVCKUGsAAAA/i2p/i2pupdate.sud"
               publicurl="http://dev.i2p.net/i2p/i2pupdate.sud"
               anonannouncement="http://i2p/NF2RLVUxVulR3IqK0sGJR0dHQcGXAzwa6rEO4WAWYXOHw-DoZhKnlbf1nzHXwMEJoex5nFTyiNMqxJMWlY54cvU~UenZdkyQQeUSBZXyuSweflUXFqKN-y8xIoK2w9Ylq1k8IcrAFDsITyOzjUKoOPfVq34rKNDo7fYyis4kT5bAHy~2N1EVMs34pi2RFabATIOBk38Qhab57Umpa6yEoE~rbyR~suDRvD7gjBvBiIKFqhFueXsR2uSrPB-yzwAGofTXuklofK3DdKspciclTVzqbDjsk5UXfu2nTrC1agkhLyqlOfjhyqC~t1IXm-Vs2o7911k7KKLGjB4lmH508YJ7G9fLAUyjuB-wwwhejoWqvg7oWvqo4oIok8LG6ECR71C3dzCvIjY2QcrhoaazA9G4zcGMm6NKND-H4XY6tUWhpB~5GefB3YczOqMbHq4wi0O9MzBFrOJEOs3X4hwboKWANf7DT5PZKJZ5KorQPsYRSq0E3wSOsFCSsdVCKUGsAAAA/pipermail/i2p/2005-September/000878.html" 
@@ -11,18 +11,22 @@
             publiclogs="http://www.i2p.net/meeting141" />
 <p>
 &#149;
-2008-08-24: <b>0.6.3 <a href="http://www.i2p2.i2p/release-0.6.3.html">Released</a></b>
+2008-10-05: <b>0.6.4 <a href="http://www.i2p2.i2p/release-0.6.4.html">Released</a></b>
 </p><p>
-The 0.6.3 release introduces multiple bugfixes, optimizations and security improvements.
-Routers will start monitoring the number of well-behaved NetDB peers,
-volunteering as one if a shortage develops and they can.
-Well-behaved NetDB nodes are preferred stronger, and ill-behaved nodes
-blacklisted more effectively. LeaseSets are handled more efficiently,
-new fixes should enable the correct operation of UDP introducers.
-I2P also gains preliminary support for permanent IP blocklists,
-and a new peer connection limiter. Improvements to the Router Console
-should make configuring client applications easier and I2PSnark
-will now resist corrupt data better.</p>
+The 0.6.4 release adds performance and stability improvements.
+Floodfill peers which are already connected, are preferred
+for RouterInfo stores, and references to new floodfill peers
+obtained from ordinary peers in case of shortage.
+
+Preference for already connected peers is generally increased
+by considering them active. Timeouts during tunnel joins
+are now counted against peer profiles.
+
+Improvements to the shutdown handler, tunnel builder,
+router throttling, collection of tunnel pool statistics,
+as well as router console and I2PSnark improvements
+(and texts to explain reachability issues) are also included.
+</p>
 
 <!--
 &#149;
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index e885038e2f..5f843aafd8 100644
--- a/router/java/src/net/i2p/router/RouterVersion.java
+++ b/router/java/src/net/i2p/router/RouterVersion.java
@@ -16,8 +16,8 @@ import net.i2p.CoreVersion;
  */
 public class RouterVersion {
     public final static String ID = "$Revision: 1.548 $ $Date: 2008-06-07 23:00:00 $";
-    public final static String VERSION = "0.6.3";
-    public final static long BUILD = 9;
+    public final static String VERSION = "0.6.4";
+    public final static long BUILD = 0;
     public static void main(String args[]) {
         System.out.println("I2P Router version: " + VERSION + "-" + BUILD);
         System.out.println("Router ID: " + RouterVersion.ID);