diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelServer.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelServer.java
index 31f5f17834c7250f9f62e1492385414985eb0cc8..babdba976de36619bbcdcbb3cda169d257f5880f 100644
--- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelServer.java
+++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelServer.java
@@ -210,7 +210,9 @@ public class I2PTunnelServer extends I2PTunnelTask implements Runnable {
      *
      */
     public void startRunning() {
-        Thread t = new I2PAppThread(this, "Server " + remoteHost + ':' + remotePort, true);
+        // prevent JVM exit when running outside the router
+        boolean isDaemon = getTunnel().getContext().isRouterContext();
+        Thread t = new I2PAppThread(this, "Server " + remoteHost + ':' + remotePort, isDaemon);
         t.start();
     }
 
diff --git a/history.txt b/history.txt
index 39cbf8e37b6880f7eb4592bbae78c82d6cf389c9..83cbcc3c60f8f52989ccf339bcc1fe749c5ba0b8 100644
--- a/history.txt
+++ b/history.txt
@@ -1,5 +1,10 @@
+2011-02-19 zzz
+    * I2PTunnel: Fix standalone server tunnels
+                 http://forum.i2p/viewtopic.php?t=5376
+
 2011-02-18 Mathiasdm
     * Desktopgui now has an option to be disabled (desktopgui.enabled)
+
 2011-02-17 zzz
     * Build:
       - Add includeAntRuntime=false to all javac targets
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index 31c35f8c3e7f27dae7384d36e3443978e8ab5e40..25340f779d31df7c3f3df56d3d62b65ed0ca042b 100644
--- a/router/java/src/net/i2p/router/RouterVersion.java
+++ b/router/java/src/net/i2p/router/RouterVersion.java
@@ -18,10 +18,10 @@ public class RouterVersion {
     /** deprecated */
     public final static String ID = "Monotone";
     public final static String VERSION = CoreVersion.VERSION;
-    public final static long BUILD = 14;
+    public final static long BUILD = 15;
 
     /** for example "-test" */
-    public final static String EXTRA = "";
+    public final static String EXTRA = "-rc";
     public final static String FULL_VERSION = VERSION + "-" + BUILD + EXTRA;
     public static void main(String args[]) {
         System.out.println("I2P Router version: " + FULL_VERSION);