diff --git a/java/compiler/compile-server/src/org/jetbrains/jpsservice/Bootstrap.java b/java/compiler/compile-server/src/org/jetbrains/jpsservice/Bootstrap.java
index 8eeb8b442b06..0f6075c4a28e 100644
--- a/java/compiler/compile-server/src/org/jetbrains/jpsservice/Bootstrap.java
+++ b/java/compiler/compile-server/src/org/jetbrains/jpsservice/Bootstrap.java
@@ -28,14 +28,18 @@ import java.util.List;
  */
 public class Bootstrap {
 
+  public static final String JPS_RUNTIME_PATH = "rt/jps-incremental";
+
   public static List<File> buildServerProcessClasspath() {
     final List<File> cp = new ArrayList<File>();
     cp.add(getResourcePath(Server.class));
     cp.add(getResourcePath(com.google.protobuf.Message.class));
     cp.add(getResourcePath(org.jboss.netty.bootstrap.Bootstrap.class));
-    final File jpsJar = getResourcePath(Facade.class);
-    final File parentFile = jpsJar.getParentFile();
-    final File[] files = parentFile.listFiles();
+    final File jpsFacadeJar = getResourcePath(Facade.class);
+    cp.add(jpsFacadeJar);
+
+    final File jpsRuntime = new File(jpsFacadeJar.getParentFile(), JPS_RUNTIME_PATH);
+    final File[] files = jpsRuntime.listFiles();
     if (files != null) {
       for (File file : files) {
         final String name = file.getName();
diff --git a/java/compiler/impl/src/com/intellij/compiler/JpsServerManager.java b/java/compiler/impl/src/com/intellij/compiler/JpsServerManager.java
index ea6b4d65a1f0..91afbb83735d 100644
--- a/java/compiler/impl/src/com/intellij/compiler/JpsServerManager.java
+++ b/java/compiler/impl/src/com/intellij/compiler/JpsServerManager.java
@@ -185,7 +185,7 @@ public class JpsServerManager implements ApplicationComponent{
     final Sdk projectJdk = JavaAwareProjectJdkTableImpl.getInstanceEx().getInternalJdk();
     final GeneralCommandLine cmdLine = new GeneralCommandLine();
     cmdLine.setExePath(((JavaSdkType)projectJdk.getSdkType()).getVMExecutablePath(projectJdk));
-    cmdLine.addParameter("-Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5007");
+    //cmdLine.addParameter("-Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5007");
     cmdLine.addParameter("-Xmx256m");
     cmdLine.addParameter("-classpath");
 
diff --git a/lib/rt/jps-incremental/jps-facade.jar b/lib/jps-facade.jar
similarity index 71%
rename from lib/rt/jps-incremental/jps-facade.jar
rename to lib/jps-facade.jar
index 7cc4e3de7235..ae5c821e9f8d 100644
Binary files a/lib/rt/jps-incremental/jps-facade.jar and b/lib/jps-facade.jar differ
diff --git a/lib/required_for_dist.txt b/lib/required_for_dist.txt
index 8a9d868c0ea5..18d003287dd8 100644
--- a/lib/required_for_dist.txt
+++ b/lib/required_for_dist.txt
@@ -44,4 +44,4 @@ xstream.jar
 swingx-core-1.6.2.jar
 netty-3.2.5.Final.jar
 protobuf-2.3.0.jar
-
+jps-facade.jar
diff --git a/lib/rt/jps-incremental/jps.jar b/lib/rt/jps-incremental/jps.jar
index 3c143522ed57..7922b7de2b29 100644
Binary files a/lib/rt/jps-incremental/jps.jar and b/lib/rt/jps-incremental/jps.jar differ
diff --git a/lib/rt/jps-incremental/src/jps-sources.zip b/lib/rt/jps-incremental/src/jps-sources.zip
index b0728cda3ca5..6ada8fcd63db 100644
Binary files a/lib/rt/jps-incremental/src/jps-sources.zip and b/lib/rt/jps-incremental/src/jps-sources.zip differ
diff --git a/lib/rt/required_for_dist.txt b/lib/rt/required_for_dist.txt
index c419eb6f450e..4970cac90c09 100644
--- a/lib/rt/required_for_dist.txt
+++ b/lib/rt/required_for_dist.txt
@@ -8,4 +8,3 @@ jps-incremental/jps.jar
 jps-incremental/jps-gwt.jar
 jps-incremental/jps-javaee.jar
 jps-incremental/jps-jpa.jar
-jps-incremental/jps-facade.jar