diff --git a/apps/routerconsole/java/build.xml b/apps/routerconsole/java/build.xml
index 2ced130bbd..185c4976a5 100644
--- a/apps/routerconsole/java/build.xml
+++ b/apps/routerconsole/java/build.xml
@@ -101,7 +101,8 @@
             <manifest>
                 <!-- top level installer will rename to jrobin.jar -->
                 <!-- DTG added in 0.8.4, not in the classpath for very old installs, before we changed wrapper.config to specify * -->
-                <attribute name="Class-Path" value="i2p.jar router.jar jrobin.jar desktopgui.jar" />
+                <!-- very old installs don't have i2psnark,jstl,standard in the classpath... not added in WebAppConfiguration any more -->
+                <attribute name="Class-Path" value="i2p.jar router.jar jrobin.jar desktopgui.jar i2psnark.jar jstl.jar standard.jar" />
                 <attribute name="Implementation-Version" value="${full.version}" />
                 <attribute name="Built-By" value="${build.built-by}" />
                 <attribute name="Build-Date" value="${build.timestamp}" />
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/WebAppConfiguration.java b/apps/routerconsole/java/src/net/i2p/router/web/WebAppConfiguration.java
index 7d3aee0652..98ca931133 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/WebAppConfiguration.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/WebAppConfiguration.java
@@ -68,13 +68,7 @@ public class WebAppConfiguration implements Configuration {
 
         File dir = libDir;
         String cp;
-        if (ctxPath.equals("/susidns")) {
-            // jars moved from the .war to lib/ in 0.7.12
-            cp = "jstl.jar,standard.jar";
-        } else if (ctxPath.equals("/i2psnark")) {
-            // duplicate classes removed from the .war in 0.7.12
-            cp = "i2psnark.jar";
-        } else if (pluginDir.exists()) {
+        if (pluginDir.exists()) {
             File consoleDir = new File(pluginDir, "console");
             Properties props = RouterConsoleRunner.webAppProperties(consoleDir.getAbsolutePath());
             cp = props.getProperty(RouterConsoleRunner.PREFIX + appName + CLASSPATH);
@@ -101,6 +95,9 @@ public class WebAppConfiguration implements Configuration {
                 path = dir.getAbsolutePath() + '/' + elem;
             // As of Jetty 6, we can't add dups to the class path, or
             // else it screws up statics
+            // This is not a complete solution because the Windows no-wrapper classpath is set
+            // by the launchi2p.jar (i2p.exe) manifest and is not detected below.
+            // TODO: Add a classpath to the command line in i2pstandalone.xml?
             File jfile = new File(path);
             File jdir = jfile.getParentFile();
             if (systemCP.contains(jfile.toURI().toURL()) ||
diff --git a/build.xml b/build.xml
index c9fb19bff8..c310970b3a 100644
--- a/build.xml
+++ b/build.xml
@@ -240,7 +240,7 @@
         <jar destfile="./build/launchi2p.jar">
             <manifest>
 	     <attribute name="Main-Class" value="net.i2p.router.RouterLaunch" />
-	     <attribute name="Class-Path" value="lib/i2p.jar lib/router.jar lib/jbigi.jar lib/BOB.jar lib/sam.jar lib/mstreaming.jar lib/streaming.jar lib/routerconsole.jar lib/i2ptunnel.jar lib/org.mortbay.jetty.jar lib/javax.servlet.jar lib/jasper-compiler.jar lib/jasper-runtime.jar lib/commons-logging.jar lib/commons-el.jar lib/wrapper.jar lib/systray.jar lib/systray4j.jar lib/desktopgui.jar" />
+	     <attribute name="Class-Path" value="lib/i2p.jar lib/router.jar lib/jbigi.jar lib/BOB.jar lib/sam.jar lib/mstreaming.jar lib/streaming.jar lib/routerconsole.jar lib/i2ptunnel.jar lib/org.mortbay.jetty.jar lib/javax.servlet.jar lib/jasper-compiler.jar lib/jasper-runtime.jar lib/commons-logging.jar lib/commons-el.jar lib/wrapper.jar lib/systray.jar lib/systray4j.jar lib/desktopgui.jar lib/i2psnark.jar lib/jrobin.jar lib/jstl.jar lib/standard.jar lib/jetty-i2p.jar lib/jetty-java5-threadpool.jar lib/jetty-rewrite-handler.jar lib/jetty-sslengine.jar lib/jetty-start.jar lib/jetty-util.jar" />
              <attribute name="Built-By" value="${build.built-by}" />
              <attribute name="Build-Date" value="${build.timestamp}" />
              <attribute name="Base-Revision" value="${workspace.version}" />
diff --git a/history.txt b/history.txt
index 71a2b30179..cb0d1f56b7 100644
--- a/history.txt
+++ b/history.txt
@@ -1,3 +1,8 @@
+2012-04-20 zzz
+ * Remove search box
+ * Fix i2psnark dir when started from Windows no-wrapper
+   (ticket #627)
+
 2012-04-14 kytv
  * Update wrapper to v3.5.14
  * Update geoip.txt from Maxmind's April 2012 database
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index 3388ca8193..931fb7af41 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 = 27;
+    public final static long BUILD = 28;
 
     /** for example "-test" */
     public final static String EXTRA = "";