diff --git a/history.txt b/history.txt
index c6fa6c93e..dbe927538 100644
--- a/history.txt
+++ b/history.txt
@@ -1,3 +1,6 @@
+2011-06-10 kytv
+   * jcpuid & jbigi added for 64bit Windows (only used with a 64bit jvm).
+
 2011-06-09 kytv
    * Added an x64 wrapper for Windows. This is needed because a 32bit wrapper
      cannot start a 64bit JVM.
diff --git a/installer/lib/jbigi/jbigi-windows-athlon64_64.dll b/installer/lib/jbigi/jbigi-windows-athlon64_64.dll
new file mode 100644
index 000000000..ecb3dcc41
Binary files /dev/null and b/installer/lib/jbigi/jbigi-windows-athlon64_64.dll differ
diff --git a/installer/lib/jbigi/jbigi-windows-atom_64.dll b/installer/lib/jbigi/jbigi-windows-atom_64.dll
new file mode 100644
index 000000000..7bc0aae50
Binary files /dev/null and b/installer/lib/jbigi/jbigi-windows-atom_64.dll differ
diff --git a/installer/lib/jbigi/jbigi-windows-core2_64.dll b/installer/lib/jbigi/jbigi-windows-core2_64.dll
new file mode 100644
index 000000000..677a118d9
Binary files /dev/null and b/installer/lib/jbigi/jbigi-windows-core2_64.dll differ
diff --git a/installer/lib/jbigi/jbigi-windows-corei_64.dll b/installer/lib/jbigi/jbigi-windows-corei_64.dll
new file mode 100644
index 000000000..0324c9a13
Binary files /dev/null and b/installer/lib/jbigi/jbigi-windows-corei_64.dll differ
diff --git a/installer/lib/jbigi/jbigi-windows-nano_64.dll b/installer/lib/jbigi/jbigi-windows-nano_64.dll
new file mode 100644
index 000000000..dd4af8bbd
Binary files /dev/null and b/installer/lib/jbigi/jbigi-windows-nano_64.dll differ
diff --git a/installer/lib/jbigi/jbigi-windows-none_64.dll b/installer/lib/jbigi/jbigi-windows-none_64.dll
new file mode 100644
index 000000000..262e9bb87
Binary files /dev/null and b/installer/lib/jbigi/jbigi-windows-none_64.dll differ
diff --git a/installer/lib/jbigi/jbigi-windows-none_64_64.dll b/installer/lib/jbigi/jbigi-windows-none_64_64.dll
new file mode 100644
index 000000000..252d79c61
Binary files /dev/null and b/installer/lib/jbigi/jbigi-windows-none_64_64.dll differ
diff --git a/installer/lib/jbigi/jbigi-windows-pentium4_64.dll b/installer/lib/jbigi/jbigi-windows-pentium4_64.dll
new file mode 100644
index 000000000..836f81bea
Binary files /dev/null and b/installer/lib/jbigi/jbigi-windows-pentium4_64.dll differ
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 = "";