diff --git a/core/java/src/net/i2p/client/naming/BlockfileNamingService.java b/core/java/src/net/i2p/client/naming/BlockfileNamingService.java
index f39f46bf2..34d5bd281 100644
--- a/core/java/src/net/i2p/client/naming/BlockfileNamingService.java
+++ b/core/java/src/net/i2p/client/naming/BlockfileNamingService.java
@@ -418,10 +418,10 @@ public class BlockfileNamingService extends DummyNamingService {
             // version 3 -> version 4
             // support multiple destinations per hostname
             if (VersionComparator.comp(_version, "4") < 0) {
-                // Upgrade of 4K entry DB on RPi 2 is over 2 1/2 minutes, disable for now
-                if (SystemVersion.isAndroid() || SystemVersion.isARM()) {
+                // Upgrade of 4K entry DB on RPi 2 is over 2 1/2 minutes, probably worse on Android, disable for now
+                if (SystemVersion.isAndroid()) {
                     if (_log.shouldWarn())
-                        _log.warn("Deferring upgrade to version 4 on Android/ARM");
+                        _log.warn("Deferring upgrade to version 4 on Android");
                     return true;
                 }
                 SkipList<String, Properties> hdr = _bf.getIndex(INFO_SKIPLIST, _stringSerializer, _infoSerializer);
diff --git a/history.txt b/history.txt
index 112eadc12..92010d362 100644
--- a/history.txt
+++ b/history.txt
@@ -1,3 +1,7 @@
+2017-03-25 zzz
+ * Blockfile: Upgrade to Blockfile format 4 on non-Android ARM
+ * i2ptunnel: Allow alt priv key file to be added without restarting I2P
+
 2017-03-24 zzz
  * Addressbook: Remove static reference, hide implementation
  * CPUID: Recognize Ryzen
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index 7ca1a3ec2..5a58b19bc 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 = 10;
+    public final static long BUILD = 11;
 
     /** for example "-test" */
     public final static String EXTRA = "";