diff --git a/apps/jetty/patches/jetty-util/src/main/java/org/eclipse/jetty/util/RolloverFileOutputStream.java b/apps/jetty/patches/jetty-util/src/main/java/org/eclipse/jetty/util/RolloverFileOutputStream.java
index 4c41fd6d1..b2a3ab554 100644
--- a/apps/jetty/patches/jetty-util/src/main/java/org/eclipse/jetty/util/RolloverFileOutputStream.java
+++ b/apps/jetty/patches/jetty-util/src/main/java/org/eclipse/jetty/util/RolloverFileOutputStream.java
@@ -185,7 +185,7 @@ public class RolloverFileOutputStream extends FilterOutputStream
         midnight = Calendar.getInstance();
         midnight.setTimeZone(_zone);
         // set to midnight
-        midnight.set(Calendar.HOUR, 0);
+        midnight.set(Calendar.HOUR_OF_DAY, 0);
         midnight.set(Calendar.MINUTE, 0);
         midnight.set(Calendar.SECOND, 0);
         midnight.set(Calendar.MILLISECOND, 0);
diff --git a/history.txt b/history.txt
index 545a4ab58..9888a2c70 100644
--- a/history.txt
+++ b/history.txt
@@ -1,3 +1,6 @@
+2017-04-30 zzz
+ * Jetty: Rollover log files at midnight, not noon
+
 2017-04-29 zzz
  * Build: Fix failing release tests
  * Jetty:
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index 78754ef28..601535dbe 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 = 20;
+    public final static long BUILD = 21;
 
     /** for example "-test" */
     public final static String EXTRA = "-rc";