diff --git a/apps/routerconsole/java/src/net/i2p/router/web/SummaryHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/SummaryHelper.java
index a275e2a612b790313cdde81fde1eb67d15dbb55c..8663d35fe3048f28f4fd5f29208134be3f48288f 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/SummaryHelper.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/SummaryHelper.java
@@ -48,7 +48,7 @@ public class SummaryHelper extends HelperBase {
      *
      */
     public String getVersion() { 
-        return RouterVersion.VERSION + "-" + RouterVersion.BUILD;
+        return RouterVersion.FULL_VERSION;
     }
     /**
      * Retrieve a pretty printed uptime count (ala 4d or 7h or 39m)
diff --git a/router/java/src/net/i2p/router/Router.java b/router/java/src/net/i2p/router/Router.java
index c9a95dd552208c43145fa8b634cb375b7656635f..2c9a1319ea24cd2ab5ece01a1cdd265522185046 100644
--- a/router/java/src/net/i2p/router/Router.java
+++ b/router/java/src/net/i2p/router/Router.java
@@ -999,8 +999,7 @@ public class Router {
     }
     
     public static void main(String args[]) {
-        System.out.println("Starting I2P " + RouterVersion.VERSION + "-" + RouterVersion.BUILD);
-        System.out.println(RouterVersion.ID);
+        System.out.println("Starting I2P " + RouterVersion.FULL_VERSION);
         installUpdates();
         verifyWrapperConfig();
         Router r = new Router();
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index 5203f2360b8c639e5b7467177c7101dc9a20b67e..46331081db839ddbd056c60ec7d3466e481a1ef5 100644
--- a/router/java/src/net/i2p/router/RouterVersion.java
+++ b/router/java/src/net/i2p/router/RouterVersion.java
@@ -15,11 +15,15 @@ import net.i2p.CoreVersion;
  *
  */
 public class RouterVersion {
-    public final static String ID = "$Revision: 1.548 $ $Date: 2008-06-07 23:00:00 $";
+    /** deprecated */
+    public final static String ID = "Monotone";
     public final static String VERSION = CoreVersion.VERSION;
     public final static long BUILD = 5;
+    /** for example "-test" */
+    public final static String EXTRA = "";
+    public final static String FULL_VERSION = VERSION + "-" + BUILD + EXTRA;
     public static void main(String args[]) {
-        System.out.println("I2P Router version: " + VERSION + "-" + BUILD);
+        System.out.println("I2P Router version: " + FULL_VERSION);
         System.out.println("Router ID: " + RouterVersion.ID);
         System.out.println("I2P Core version: " + CoreVersion.VERSION);
         System.out.println("Core ID: " + CoreVersion.ID);