diff --git a/bin/win/breakgen64.dll b/bin/win/breakgen64.dll
new file mode 100644
index 000000000000..828b6f7acddc
Binary files /dev/null and b/bin/win/breakgen64.dll differ
diff --git a/java/java-runtime/src/com/intellij/rt/execution/application/AppMain.java b/java/java-runtime/src/com/intellij/rt/execution/application/AppMain.java
index 912afc938181..8b4232e32f6a 100644
--- a/java/java-runtime/src/com/intellij/rt/execution/application/AppMain.java
+++ b/java/java-runtime/src/com/intellij/rt/execution/application/AppMain.java
@@ -39,7 +39,12 @@ public class AppMain {
     final String osName = System.getProperty("os.name").toLowerCase();
     String libPath = null;
     if (osName.startsWith("windows")) {
-      libPath = binPath + "breakgen.dll";
+      if (System.getProperty("os.arch").equals("amd64")) {
+        libPath = binPath + "breakgen64.dll";
+      }
+      else {
+        libPath = binPath + "breakgen.dll";
+      }
     } else if (osName.startsWith("linux")) {
       if (System.getProperty("os.name").toLowerCase().equals("amd64")) {
         libPath = binPath + "libbreakgen64.so";
diff --git a/native/breakgen/AppMain.c b/native/breakgen/AppMain.c
index 4b33f16fa89c..15b2831ab366 100644
--- a/native/breakgen/AppMain.c
+++ b/native/breakgen/AppMain.c
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
+#include <jni.h>
 #if defined(WIN32)
 #include <windows.h>
 #else
-#include <jni.h>
 #include <signal.h>
 #include <unistd.h>
 #include <stdlib.h>