diff --git a/apps/systray/java/src/net/i2p/apps/systray/UrlLauncher.java b/apps/systray/java/src/net/i2p/apps/systray/UrlLauncher.java
index 7ccc5e2a2..5487f5faf 100644
--- a/apps/systray/java/src/net/i2p/apps/systray/UrlLauncher.java
+++ b/apps/systray/java/src/net/i2p/apps/systray/UrlLauncher.java
@@ -74,7 +74,11 @@ public class UrlLauncher {
                     bufferedReader = new BufferedReader(new InputStreamReader(new FileInputStream("browser.reg"), "UTF-16"));
                     for (String line; (line = bufferedReader.readLine()) != null; ) {
                         if (line.startsWith("@=")) {
-                            browserString = "\"" + line.substring(3, line.toLowerCase().indexOf(".exe") + 4) + "\"";
+                            // we should really use the whole line and replace %1 with the url
+                            browserString = line.substring(3, line.toLowerCase().indexOf(".exe") + 4);
+                            if (browserString.startsWith("\\\""))
+                                browserString = browserString.substring(2);
+                            browserString = "\"" + browserString + "\"";
                         }
                     }
                     try {
diff --git a/build.xml b/build.xml
index 4410a8aa1..f7e7030cb 100644
--- a/build.xml
+++ b/build.xml
@@ -332,6 +332,8 @@
         <copy file="build/BOB.jar" todir="pkg-temp/lib/" />
         <copy file="build/sam.jar" todir="pkg-temp/lib/" />
         <copy file="build/i2psnark.jar" todir="pkg-temp/lib" />
+        <!-- include systray fixes in 0.6.5 -->
+        <copy file="build/systray.jar" todir="pkg-temp/lib/" />
         <copy file="build/susimail.war" todir="pkg-temp/webapps/" />
         <copy file="build/susidns.war" todir="pkg-temp/webapps/" />
         <copy file="build/i2psnark.war" todir="pkg-temp/webapps/" />
diff --git a/history.txt b/history.txt
index 7caf84a83..fee2dcf0d 100644
--- a/history.txt
+++ b/history.txt
@@ -1,3 +1,6 @@
+2008-11-26 zzz
+    * Fix Windows UrlLauncher
+
 2008-11-21 zzz
     * Cache DNS and negative DNS for 5m (was 1m and forever)
     * Delay shitlist cleaner at startup
diff --git a/installer/resources/clients.config b/installer/resources/clients.config
index 62cea2258..5245e3bfc 100644
--- a/installer/resources/clients.config
+++ b/installer/resources/clients.config
@@ -27,7 +27,7 @@ clientApp.3.startOnLoad=true
 # load a browser pointing at the web console whenever we start up
 clientApp.4.main=net.i2p.apps.systray.UrlLauncher
 clientApp.4.name=consoleBrowser
-clientApp.4.args=http://localhost:7657/
+clientApp.4.args=http://localhost:7657/index.jsp
 clientApp.4.delay=5
 clientApp.4.startOnLoad=true