diff --git a/plugins/maven/maven3-server-impl/lib/aether-api-1.9.jar b/plugins/maven/maven3-server-impl/lib/aether-api-1.9.jar
deleted file mode 100644
index 1f4a19504c34..000000000000
Binary files a/plugins/maven/maven3-server-impl/lib/aether-api-1.9.jar and /dev/null differ
diff --git a/plugins/maven/maven3-server-impl/lib/aether-connector-wagon-1.9.jar b/plugins/maven/maven3-server-impl/lib/aether-connector-wagon-1.9.jar
deleted file mode 100644
index d16a3c09a483..000000000000
Binary files a/plugins/maven/maven3-server-impl/lib/aether-connector-wagon-1.9.jar and /dev/null differ
diff --git a/plugins/maven/maven3-server-impl/lib/aether-impl-1.9.jar b/plugins/maven/maven3-server-impl/lib/aether-impl-1.9.jar
deleted file mode 100644
index 662ed75f9c70..000000000000
Binary files a/plugins/maven/maven3-server-impl/lib/aether-impl-1.9.jar and /dev/null differ
diff --git a/plugins/maven/maven3-server-impl/lib/aether-spi-1.9.jar b/plugins/maven/maven3-server-impl/lib/aether-spi-1.9.jar
deleted file mode 100644
index 1b23bb1f0106..000000000000
Binary files a/plugins/maven/maven3-server-impl/lib/aether-spi-1.9.jar and /dev/null differ
diff --git a/plugins/maven/maven3-server-impl/lib/aether-util-1.9.jar b/plugins/maven/maven3-server-impl/lib/aether-util-1.9.jar
deleted file mode 100644
index 5e790f59b0e0..000000000000
Binary files a/plugins/maven/maven3-server-impl/lib/aether-util-1.9.jar and /dev/null differ
diff --git a/plugins/maven/maven3-server-impl/lib/commons-cli-1.2.jar b/plugins/maven/maven3-server-impl/lib/commons-cli-1.2.jar
deleted file mode 100644
index ce4b9fffe40c..000000000000
Binary files a/plugins/maven/maven3-server-impl/lib/commons-cli-1.2.jar and /dev/null differ
diff --git a/plugins/maven/maven3-server-impl/lib/maven-aether-provider-3.0.2.jar b/plugins/maven/maven3-server-impl/lib/maven-aether-provider-3.0.2.jar
deleted file mode 100644
index e6994bcb49ca..000000000000
Binary files a/plugins/maven/maven3-server-impl/lib/maven-aether-provider-3.0.2.jar and /dev/null differ
diff --git a/plugins/maven/maven3-server-impl/lib/maven-artifact-3.0.2.jar b/plugins/maven/maven3-server-impl/lib/maven-artifact-3.0.2.jar
deleted file mode 100644
index c60fd16c3646..000000000000
Binary files a/plugins/maven/maven3-server-impl/lib/maven-artifact-3.0.2.jar and /dev/null differ
diff --git a/plugins/maven/maven3-server-impl/lib/maven-compat-3.0.2.jar b/plugins/maven/maven3-server-impl/lib/maven-compat-3.0.2.jar
deleted file mode 100644
index d25998605211..000000000000
Binary files a/plugins/maven/maven3-server-impl/lib/maven-compat-3.0.2.jar and /dev/null differ
diff --git a/plugins/maven/maven3-server-impl/lib/maven-core-3.0.2.jar b/plugins/maven/maven3-server-impl/lib/maven-core-3.0.2.jar
deleted file mode 100644
index 34935d6630d9..000000000000
Binary files a/plugins/maven/maven3-server-impl/lib/maven-core-3.0.2.jar and /dev/null differ
diff --git a/plugins/maven/maven3-server-impl/lib/maven-embedder-3.0.2.jar b/plugins/maven/maven3-server-impl/lib/maven-embedder-3.0.2.jar
deleted file mode 100644
index 5aa98a972ab6..000000000000
Binary files a/plugins/maven/maven3-server-impl/lib/maven-embedder-3.0.2.jar and /dev/null differ
diff --git a/plugins/maven/maven3-server-impl/lib/maven-model-3.0.2.jar b/plugins/maven/maven3-server-impl/lib/maven-model-3.0.2.jar
deleted file mode 100644
index 8b64b8665791..000000000000
Binary files a/plugins/maven/maven3-server-impl/lib/maven-model-3.0.2.jar and /dev/null differ
diff --git a/plugins/maven/maven3-server-impl/lib/maven-model-builder-3.0.2.jar b/plugins/maven/maven3-server-impl/lib/maven-model-builder-3.0.2.jar
deleted file mode 100644
index df8ffbbe6829..000000000000
Binary files a/plugins/maven/maven3-server-impl/lib/maven-model-builder-3.0.2.jar and /dev/null differ
diff --git a/plugins/maven/maven3-server-impl/lib/maven-plugin-api-3.0.2.jar b/plugins/maven/maven3-server-impl/lib/maven-plugin-api-3.0.2.jar
deleted file mode 100644
index d074043c5872..000000000000
Binary files a/plugins/maven/maven3-server-impl/lib/maven-plugin-api-3.0.2.jar and /dev/null differ
diff --git a/plugins/maven/maven3-server-impl/lib/maven-repository-metadata-3.0.2.jar b/plugins/maven/maven3-server-impl/lib/maven-repository-metadata-3.0.2.jar
deleted file mode 100644
index eb579ce8108b..000000000000
Binary files a/plugins/maven/maven3-server-impl/lib/maven-repository-metadata-3.0.2.jar and /dev/null differ
diff --git a/plugins/maven/maven3-server-impl/lib/maven-settings-3.0.2.jar b/plugins/maven/maven3-server-impl/lib/maven-settings-3.0.2.jar
deleted file mode 100644
index d9a485ceba21..000000000000
Binary files a/plugins/maven/maven3-server-impl/lib/maven-settings-3.0.2.jar and /dev/null differ
diff --git a/plugins/maven/maven3-server-impl/lib/maven-settings-builder-3.0.2.jar b/plugins/maven/maven3-server-impl/lib/maven-settings-builder-3.0.2.jar
deleted file mode 100644
index 08b7c855b95b..000000000000
Binary files a/plugins/maven/maven3-server-impl/lib/maven-settings-builder-3.0.2.jar and /dev/null differ
diff --git a/plugins/maven/maven3-server-impl/lib/nekohtml-1.9.6.2.jar b/plugins/maven/maven3-server-impl/lib/nekohtml-1.9.6.2.jar
deleted file mode 100644
index 716901e6bb5f..000000000000
Binary files a/plugins/maven/maven3-server-impl/lib/nekohtml-1.9.6.2.jar and /dev/null differ
diff --git a/plugins/maven/maven3-server-impl/lib/plexus-cipher-1.4.jar b/plugins/maven/maven3-server-impl/lib/plexus-cipher-1.4.jar
deleted file mode 100644
index 9227205cda8b..000000000000
Binary files a/plugins/maven/maven3-server-impl/lib/plexus-cipher-1.4.jar and /dev/null differ
diff --git a/plugins/maven/maven3-server-impl/lib/plexus-component-annotations-1.5.5.jar b/plugins/maven/maven3-server-impl/lib/plexus-component-annotations-1.5.5.jar
deleted file mode 100644
index e4de16fef89c..000000000000
Binary files a/plugins/maven/maven3-server-impl/lib/plexus-component-annotations-1.5.5.jar and /dev/null differ
diff --git a/plugins/maven/maven3-server-impl/lib/plexus-interpolation-1.14.jar b/plugins/maven/maven3-server-impl/lib/plexus-interpolation-1.14.jar
deleted file mode 100644
index eee5c5736bd9..000000000000
Binary files a/plugins/maven/maven3-server-impl/lib/plexus-interpolation-1.14.jar and /dev/null differ
diff --git a/plugins/maven/maven3-server-impl/lib/plexus-sec-dispatcher-1.3.jar b/plugins/maven/maven3-server-impl/lib/plexus-sec-dispatcher-1.3.jar
deleted file mode 100644
index 9dc9f64b27a6..000000000000
Binary files a/plugins/maven/maven3-server-impl/lib/plexus-sec-dispatcher-1.3.jar and /dev/null differ
diff --git a/plugins/maven/maven3-server-impl/lib/plexus-utils-2.0.4.jar b/plugins/maven/maven3-server-impl/lib/plexus-utils-2.0.4.jar
deleted file mode 100644
index 2a6972cc6d20..000000000000
Binary files a/plugins/maven/maven3-server-impl/lib/plexus-utils-2.0.4.jar and /dev/null differ
diff --git a/plugins/maven/maven3-server-impl/lib/sisu-guice-2.9.1-noaop.jar b/plugins/maven/maven3-server-impl/lib/sisu-guice-2.9.1-noaop.jar
deleted file mode 100644
index bae6c312f65b..000000000000
Binary files a/plugins/maven/maven3-server-impl/lib/sisu-guice-2.9.1-noaop.jar and /dev/null differ
diff --git a/plugins/maven/maven3-server-impl/lib/sisu-inject-bean-1.4.3.1.jar b/plugins/maven/maven3-server-impl/lib/sisu-inject-bean-1.4.3.1.jar
deleted file mode 100644
index dab4cd8df176..000000000000
Binary files a/plugins/maven/maven3-server-impl/lib/sisu-inject-bean-1.4.3.1.jar and /dev/null differ
diff --git a/plugins/maven/maven3-server-impl/lib/sisu-inject-plexus-1.4.3.1.jar b/plugins/maven/maven3-server-impl/lib/sisu-inject-plexus-1.4.3.1.jar
deleted file mode 100644
index 9c5283d3d3c9..000000000000
Binary files a/plugins/maven/maven3-server-impl/lib/sisu-inject-plexus-1.4.3.1.jar and /dev/null differ
diff --git a/plugins/maven/maven3-server-impl/lib/wagon-file-1.0-beta-7.jar b/plugins/maven/maven3-server-impl/lib/wagon-file-1.0-beta-7.jar
deleted file mode 100644
index 2e59d4be5eb6..000000000000
Binary files a/plugins/maven/maven3-server-impl/lib/wagon-file-1.0-beta-7.jar and /dev/null differ
diff --git a/plugins/maven/maven3-server-impl/lib/wagon-http-lightweight-1.0-beta-7.jar b/plugins/maven/maven3-server-impl/lib/wagon-http-lightweight-1.0-beta-7.jar
deleted file mode 100644
index 2aca330cd81f..000000000000
Binary files a/plugins/maven/maven3-server-impl/lib/wagon-http-lightweight-1.0-beta-7.jar and /dev/null differ
diff --git a/plugins/maven/maven3-server-impl/lib/wagon-http-shared-1.0-beta-7.jar b/plugins/maven/maven3-server-impl/lib/wagon-http-shared-1.0-beta-7.jar
deleted file mode 100644
index 4321708e9295..000000000000
Binary files a/plugins/maven/maven3-server-impl/lib/wagon-http-shared-1.0-beta-7.jar and /dev/null differ
diff --git a/plugins/maven/maven3-server-impl/lib/wagon-provider-api-1.0-beta-7.jar b/plugins/maven/maven3-server-impl/lib/wagon-provider-api-1.0-beta-7.jar
deleted file mode 100644
index 052b2659308b..000000000000
Binary files a/plugins/maven/maven3-server-impl/lib/wagon-provider-api-1.0-beta-7.jar and /dev/null differ
diff --git a/plugins/maven/maven3-server-impl/lib/xercesMinimal-1.9.6.2.jar b/plugins/maven/maven3-server-impl/lib/xercesMinimal-1.9.6.2.jar
deleted file mode 100644
index 649a66b33c20..000000000000
Binary files a/plugins/maven/maven3-server-impl/lib/xercesMinimal-1.9.6.2.jar and /dev/null differ
diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/server/MavenServerManager.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/server/MavenServerManager.java
index 2a19da5789fa..230133baac11 100644
--- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/server/MavenServerManager.java
+++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/server/MavenServerManager.java
@@ -264,11 +264,19 @@ public class MavenServerManager extends RemoteObjectWrapper<MavenServer> {
         classpath.add(new File(pluginFileOrDir.getParent(), "maven3-server-impl"));
         File luceneLib = new File(PathUtil.getJarPathForClass(Query.class));
 
-        File maven3ServerRoot = new File(luceneLib.getParentFile().getParentFile().getParentFile(), "maven3-server-impl/lib/maven3");
+        File maven3Lib = new File(luceneLib.getParentFile().getParentFile().getParentFile(), "maven3-server-impl/lib/maven3");
 
-        libDir = new File(maven3ServerRoot, "lib");
+        File maven3Home = new File(maven3Lib, "maven3");
 
-        classpath.add(new File(maven3ServerRoot, "boot/plexus-classworlds-2.4.jar"));
+        libDir = new File(maven3Home, "lib");
+
+        classpath.add(new File(maven3Home, "boot/plexus-classworlds-2.4.jar"));
+
+        for (File jar : maven3Lib.listFiles()) {
+          if (jar.isFile() && jar.getName().endsWith(".jar")) {
+            classpath.add(jar);
+          }
+        }
       }
       else {
         classpath.add(new File(pluginFileOrDir.getParent(), "maven2-server-impl"));