diff --git a/apps/routerconsole/java/src/net/i2p/router/web/RouterConsoleRunner.java b/apps/routerconsole/java/src/net/i2p/router/web/RouterConsoleRunner.java
index b7f20c492..4c5095536 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/RouterConsoleRunner.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/RouterConsoleRunner.java
@@ -869,10 +869,11 @@ public class RouterConsoleRunner implements RouterApp {
      */
     private static class CustomThreadPoolExecutor extends ExecutorThreadPool {
         public CustomThreadPoolExecutor() {
-             super(MIN_THREADS, MAX_THREADS, MAX_IDLE_TIME, TimeUnit.MILLISECONDS,
-                   new SynchronousQueue()  /** ,  following args not available in Jetty 7
-                   new CustomThreadFactory(),
-                   new ThreadPoolExecutor.CallerRunsPolicy() **/
+             super(new ThreadPoolExecutor(
+                      MIN_THREADS, MAX_THREADS, MAX_IDLE_TIME, TimeUnit.MILLISECONDS,
+                      new SynchronousQueue(),
+                      new CustomThreadFactory(),
+                      new ThreadPoolExecutor.CallerRunsPolicy())
                   );
         }
     }
diff --git a/history.txt b/history.txt
index a26c8fbbc..d9edac9e0 100644
--- a/history.txt
+++ b/history.txt
@@ -1,4 +1,5 @@
 2013-05-06 zzz
+ * Console: Fix Jetty thread pool policy and thread name
  * Transports: Clean up internal/external port confusion (ticket #873)
    - Bind SSU to configured internal, not external, port at startup
    - Use only internal ports for UPnP (getRequestedPort() fixups)
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index 43dca9240..9319fc01c 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 = 21;
+    public final static long BUILD = 22;
 
     /** for example "-test" */
     public final static String EXTRA = "";