diff --git a/apps/systray/java/src/net/i2p/apps/systray/SysTray.java b/apps/systray/java/src/net/i2p/apps/systray/SysTray.java
index 23a11ef23..233f46c5b 100644
--- a/apps/systray/java/src/net/i2p/apps/systray/SysTray.java
+++ b/apps/systray/java/src/net/i2p/apps/systray/SysTray.java
@@ -37,6 +37,8 @@ public class SysTray implements SysTrayMenuListener {
     private static String         _portString;
     private static boolean        _showIcon;
     private static UrlLauncher    _urlLauncher    = new UrlLauncher();
+    private static final boolean _is64 = "64".equals(System.getProperty("sun.arch.data.model")) ||
+                                         System.getProperty("os.arch").contains("64");
 
     static {
         File config = new File(I2PAppContext.getGlobalContext().getConfigDir(), "systray.config");
@@ -52,7 +54,7 @@ public class SysTray implements SysTrayMenuListener {
         //if (!(new File("router.config")).exists())
         //    openRouterConsole("http://localhost:" + _portString + "/index.jsp");
 
-        if ( (System.getProperty("os.name").startsWith("Windows")) && (!Boolean.getBoolean("systray.disable")) )
+        if ( (System.getProperty("os.name").startsWith("Windows")) && (!Boolean.getBoolean("systray.disable")) && (!_is64))
             _instance = new SysTray();
     }
 
diff --git a/history.txt b/history.txt
index 3fa79cf0d..337203eaa 100644
--- a/history.txt
+++ b/history.txt
@@ -1,3 +1,7 @@
+2011-08-17 kytv
+  * Fix #506: Don't attempt to load systray4j when using a 64bit JVM
+    in Windows.
+
 2011-08-16 zzz
   * Console: Tweak logs page CSS
   * Graphs: Delete corrupt rrd file (ticket #483)
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index 601535dbe..a85b0c8aa 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 = "-rc";