diff --git a/apps/i2psnark/jetty-i2psnark.xml b/apps/i2psnark/jetty-i2psnark.xml
index 53d0e15e92..4a525ce8f6 100644
--- a/apps/i2psnark/jetty-i2psnark.xml
+++ b/apps/i2psnark/jetty-i2psnark.xml
@@ -22,15 +22,24 @@
   <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
   <Call name="addConnector">
     <Arg>
-        <New class="org.eclipse.jetty.server.nio.SelectChannelConnector">
+        <New class="org.eclipse.jetty.server.ServerConnector">
+          <Arg><Ref id="Server" /></Arg>
+          <Arg type="int">1</Arg>     <!-- number of acceptors -->
+          <Arg type="int">0</Arg>     <!-- default number of selectors -->
+          <Arg>
+            <Array type="org.eclipse.jetty.server.ConnectionFactory">    <!-- varargs so we need an array -->
+              <Item>
+                <New class="org.eclipse.jetty.server.HttpConnectionFactory">
+                  <Arg>
+                    <New class="org.eclipse.jetty.server.HttpConfiguration" />
+                  </Arg>
+                </New>
+              </Item>
+            </Array>
+          </Arg>
           <Set name="host">127.0.0.1</Set>
           <Set name="port">8002</Set>
-          <Set name="maxIdleTime">600000</Set>
-          <Set name="Acceptors">1</Set>
-          <Set name="statsOn">false</Set>
-          <Set name="lowResourcesConnections">5000</Set>
-          <Set name="lowResourcesMaxIdleTime">5000</Set>
-          <Set name="useDirectBuffers">false</Set>
+          <Set name="idleTimeout">600000</Set>
         </New>
     </Arg>
   </Call>
@@ -96,7 +105,7 @@
     <Ref id="DeploymentManager">
       <Call name="addAppProvider">
         <Arg>
-          <New class="org.eclipse.jetty.deploy.providers.ContextProvider">
+          <New class="org.eclipse.jetty.deploy.providers.WebAppProvider">
             <Set name="monitoredDirName">./contexts</Set>
             <Set name="scanInterval">0</Set>
           </New>
diff --git a/core/java/src/net/i2p/I2PAppContext.java b/core/java/src/net/i2p/I2PAppContext.java
index ad81fdd2ba..98f324658f 100644
--- a/core/java/src/net/i2p/I2PAppContext.java
+++ b/core/java/src/net/i2p/I2PAppContext.java
@@ -1018,6 +1018,6 @@ public class I2PAppContext {
      *  @since 0.9.11, in RouterContext since 0.9.4
      */
     public ClientAppManager clientAppManager() {
-        return null;
+        return _appManager;
     }
 }
diff --git a/history.txt b/history.txt
index dae6793ed1..40cb88d7b3 100644
--- a/history.txt
+++ b/history.txt
@@ -1,3 +1,7 @@
+2017-04-02 zzz
+ * Context: Fix ClientAppManagerImpl in AppContext
+ * i2psnark: Fix standalone configuration for Jetty 9
+
 2017-04-01 zzz
  * Console: Fix stopping of webapps when console stops (ticket #1893)
  * i2psnark: Only rewrite torrent config file if changed (ticket #1893)
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index 31c35f8c3e..ea17ad55f3 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 = 14;
+    public final static long BUILD = 15;
 
     /** for example "-test" */
     public final static String EXTRA = "";