diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigServiceHandler.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigServiceHandler.java
index 21be2aa597..4129db1368 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigServiceHandler.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigServiceHandler.java
@@ -183,6 +183,15 @@ public class ConfigServiceHandler extends FormHandler {
         }
     }
 
+    /**
+     *  Should we show the cancel button?
+     *
+     *  @since 0.9.19
+     */
+    public boolean shouldShowCancelGraceful() {
+        return _context.router().gracefulShutdownInProgress();
+    }
+
     @Override
     protected void processForm() {
         if (_action == null) return;
diff --git a/apps/routerconsole/jsp/configservice.jsp b/apps/routerconsole/jsp/configservice.jsp
index c6711cc43c..f12c9b95cb 100644
--- a/apps/routerconsole/jsp/configservice.jsp
+++ b/apps/routerconsole/jsp/configservice.jsp
@@ -25,7 +25,9 @@
   <hr><div class="formaction">
  <input type="submit" class="stop" name="action" value="<%=intl._("Shutdown gracefully")%>" >
  <input type="submit" class="stop" name="action" value="<%=intl._("Shutdown immediately")%>" >
- <input type="submit" class="cancel" name="action" value="<%=intl._("Cancel graceful shutdown")%>" >
+ <% if (formhandler.shouldShowCancelGraceful()) { %>
+     <input type="submit" class="cancel" name="action" value="<%=intl._("Cancel graceful shutdown")%>" >
+ <% } %>
  </div>
  <% if (System.getProperty("wrapper.version") != null) { %>
  <p><%=intl._("If you want the router to restart itself after shutting down, you can choose one of the following.")%> 
diff --git a/history.txt b/history.txt
index 3c0a79ddc9..7daa8e514c 100644
--- a/history.txt
+++ b/history.txt
@@ -1,3 +1,8 @@
+2015-03-08 zzz
+ * i2psnark: Increase min and default bandwidth
+ * Throttle: Tweak messages during probabalistic rejection
+ * Transport: Add missing bogons to IP validity check
+
 * 2015-02-22 0.9.18 released
 
 2015-02-18 kytv
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 = "";