diff --git a/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java b/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java
index 78dbdf30b5..42a558f5e8 100644
--- a/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java
@@ -2595,17 +2595,18 @@ public class SnarkManager implements CompleteListener {
                 DHT dht = _util.getDHT();
                 if (dht != null)
                     dht.stop();
-                // Schedule this even for final shutdown, as there's a chance
-                // that it's just this webapp that is stopping.
-                _context.simpleTimer2().addEvent(new Disconnector(), 60*1000);
                 addMessage(_t("Closing I2P tunnel after notifying trackers."));
                 if (finalShutdown) {
                     long toWait = 5*1000;
                     if (SystemVersion.isARM())
                         toWait *= 2;
                     try { Thread.sleep(toWait); } catch (InterruptedException ie) {}
+                    _util.disconnect();
+                    _stopping = false;
+                } else {
+                    // Only schedule this if not a final shutdown
+                    _context.simpleTimer2().addEvent(new Disconnector(), 60*1000);
                 }
-                _util.disconnect();
             } else {
                 _util.disconnect();
                 _stopping = false;
diff --git a/history.txt b/history.txt
index 113e5a547b..7cbfdac870 100644
--- a/history.txt
+++ b/history.txt
@@ -1,3 +1,7 @@
+2017-02-27 zzz
+ * i2psnark: Fix disappearing start button
+ * addressbook: Add date parameter to authentication strings
+
 * 2017-02-27 0.9.29 released
 
 2017-02-27 zzz
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index a411b00998..87e5bffca0 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 = 0;
+    public final static long BUILD = 1;
 
     /** for example "-test" */
     public final static String EXTRA = "";