diff --git a/core/java/src/net/i2p/CoreVersion.java b/core/java/src/net/i2p/CoreVersion.java
index ef23880e03023da76afe2da1a3c80454e8935e0b..8c8f53d254112c435292e851153b6b39577f810d 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.9.4";
+    public final static String VERSION = "0.9.5";
 
     public static void main(String args[]) {
         System.out.println("I2P Core version: " + VERSION);
diff --git a/core/java/src/net/i2p/client/datagram/I2PDatagramDissector.java b/core/java/src/net/i2p/client/datagram/I2PDatagramDissector.java
index a3afaf87ade094f4873353bcffc7d6690bb9baec..945043ea6c145ade9fb7f8c0331fac40ddd1bbb8 100644
--- a/core/java/src/net/i2p/client/datagram/I2PDatagramDissector.java
+++ b/core/java/src/net/i2p/client/datagram/I2PDatagramDissector.java
@@ -55,7 +55,7 @@ public final class I2PDatagramDissector {
      * Load an I2P repliable datagram into the dissector.
      * Does NOT verify the signature.
      *
-     * @param dgram non-null I2P repliable datagram to be loader
+     * @param dgram non-null I2P repliable datagram to be loaded
      *
      * @throws DataFormatException If there's an error in the datagram format
      */
diff --git a/history.txt b/history.txt
index d5a2fc53cab15ed72ae45947a674c602ca031bdc..463d61443e381168ec0b8bb3d389543c71cc30d8 100644
--- a/history.txt
+++ b/history.txt
@@ -1,3 +1,5 @@
+* 2013-03-08 0.9.5 released
+
 2013-03-03 zzz
  * graphs.jsp: Fix saving settings (ticket #857)
 
diff --git a/installer/install.xml b/installer/install.xml
index b06864628482f3389216a257ccf043a9bd41a1a1..c4b253228d7554f190b41791377112b8c96de789 100644
--- a/installer/install.xml
+++ b/installer/install.xml
@@ -4,7 +4,7 @@
 
     <info>
         <appname>i2p</appname>
-        <appversion>0.9.4</appversion>
+        <appversion>0.9.5</appversion>
         <authors>
             <author name="I2P" email="http://www.i2p2.de/"/>
         </authors>
diff --git a/router/java/src/net/i2p/data/i2np/DeliveryInstructions.java b/router/java/src/net/i2p/data/i2np/DeliveryInstructions.java
index b9c57da6cb150698c7fea2bb78783213efc723c4..23309dcb4846798d8925bf3b40e386cdf41fb7a7 100644
--- a/router/java/src/net/i2p/data/i2np/DeliveryInstructions.java
+++ b/router/java/src/net/i2p/data/i2np/DeliveryInstructions.java
@@ -67,7 +67,7 @@ public class DeliveryInstructions extends DataStructureImpl {
     public boolean getEncrypted() { return _encrypted; }
     
     /**
-     * For cloves only (not tunnels), default null, unused
+     * For cloves only (not tunnels), default false, unused
      * @deprecated unused
      */
     public void setEncrypted(boolean encrypted) { _encrypted = encrypted; }
@@ -79,7 +79,7 @@ public class DeliveryInstructions extends DataStructureImpl {
     public SessionKey getEncryptionKey() { return _encryptionKey; }
 
     /**
-     * For cloves only (not tunnels), default false, unused
+     * For cloves only (not tunnels), default null, unused
      * @deprecated unused
      */
     public void setEncryptionKey(SessionKey key) { _encryptionKey = key; }
diff --git a/router/java/src/net/i2p/router/JobQueue.java b/router/java/src/net/i2p/router/JobQueue.java
index 37b8bce225355f7973f9243939ec40a95dc3e8d2..813d5768fe214d6c51b742af444843671f06329a 100644
--- a/router/java/src/net/i2p/router/JobQueue.java
+++ b/router/java/src/net/i2p/router/JobQueue.java
@@ -132,7 +132,7 @@ public class JobQueue {
                                               "How many jobs do we drop due to insane overload?", 
                                               "JobQueue", 
                                               new long[] { 60*1000l, 60*60*1000l, 24*60*60*1000l });
-        // following are for JobQueue
+        // following are for JobQueueRunner
         _context.statManager().createRateStat("jobQueue.jobRun", "How long jobs take", "JobQueue", new long[] { 60*60*1000l, 24*60*60*1000l });
         _context.statManager().createRateStat("jobQueue.jobRunSlow", "How long jobs that take over a second take", "JobQueue", new long[] { 60*60*1000l, 24*60*60*1000l });
         _context.statManager().createRequiredRateStat("jobQueue.jobLag", "Job run delay (ms)", "JobQueue", new long[] { 60*1000l, 60*60*1000l, 24*60*60*1000l });
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index e36cd3b14352a16a1e79c5fea474cb2f20cbaa5c..a411b009986dc5f1f6384384ad98aeea42885422 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 = 12;
+    public final static long BUILD = 0;
 
     /** for example "-test" */
     public final static String EXTRA = "";