diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/IndexBean.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/IndexBean.java
index 385bddb7a03a9d52d5bf46ebdd1941c204ba35c5..10f80aa157a3ed94dff69979f5fd625e39073fed 100644
--- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/IndexBean.java
+++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/IndexBean.java
@@ -875,7 +875,10 @@ public class IndexBean {
             return "Tunnel must be stopped before modifying destination";
         }
 
-        PrivateKeyFile pkf = new PrivateKeyFile(new File(_context.getProperty("i2p.dir.config"), _privKeyFile));
+        File keyFile = new File(_privKeyFile);
+        if (!keyFile.isAbsolute())
+            keyFile = new File(_context.getConfigDir(), _privKeyFile);
+        PrivateKeyFile pkf = new PrivateKeyFile(keyFile);
         try {
             pkf.createIfAbsent();
         } catch (Exception e) {
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index f5c92645490ac230cc1d9da5a1333a329d7b0385..601535dbe67ba1041e3cbf512b3420489cd8bf41 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 = 20;
+    public final static long BUILD = 21;
 
     /** 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);