diff --git a/.idea/libraries/ASM.xml b/.idea/libraries/ASM.xml
index 7ed029a31507..42550f4fc4cb 100644
--- a/.idea/libraries/ASM.xml
+++ b/.idea/libraries/ASM.xml
@@ -1,11 +1,12 @@
 <component name="libraryTable">
-  <library name="ASM">
+  <library name="ASM" type="repository">
+    <properties include-transitive-deps="false" maven-id="org.jetbrains.intellij.deps:asm-all:7.0-beta" />
     <CLASSES>
-      <root url="jar://$PROJECT_DIR$/lib/asm-all.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/asm-all/7.0-beta/asm-all-7.0-beta.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
-      <root url="jar://$PROJECT_DIR$/lib/src/asm-src.zip!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/asm-all/7.0-beta/asm-all-7.0-beta-sources.jar!/" />
     </SOURCES>
   </library>
 </component>
\ No newline at end of file
diff --git a/build/dependencies/setupBuildScriptsDeps.gradle b/build/dependencies/setupBuildScriptsDeps.gradle
index 0ffa24050d18..bab1a6f8dade 100644
--- a/build/dependencies/setupBuildScriptsDeps.gradle
+++ b/build/dependencies/setupBuildScriptsDeps.gradle
@@ -14,6 +14,7 @@ configurations {
 }
 
 List<String> projectLibraries = [
+  "ASM",
   "jetbrains-annotations-java5",
   "Groovy",
   "cli-parser",
diff --git a/build/gant.xml b/build/gant.xml
index e6c8b96b8f26..30ec1170a1d1 100644
--- a/build/gant.xml
+++ b/build/gant.xml
@@ -33,7 +33,6 @@
         <include name="*.jar"/>
       </fileset>
       <fileset dir="${idea.lib}">
-        <include name="asm-all*.jar"/>
         <include name="snappy-in-java-*.jar"/>
       </fileset>
     </path>
diff --git a/lib/asm-all.jar b/lib/asm-all.jar
deleted file mode 100644
index 60e4d490c7b8..000000000000
Binary files a/lib/asm-all.jar and /dev/null differ
diff --git a/lib/src/asm-src.zip b/lib/src/asm-src.zip
deleted file mode 100644
index 762ba36a29fe..000000000000
Binary files a/lib/src/asm-src.zip and /dev/null differ
diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityLibraryLicenses.groovy b/platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityLibraryLicenses.groovy
index 5fa3f223335f..8671314c4aca 100644
--- a/platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityLibraryLicenses.groovy
+++ b/platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityLibraryLicenses.groovy
@@ -104,7 +104,7 @@ class CommunityLibraryLicenses {
                        url: "http://commons.apache.org/net/"),
     new LibraryLicense(name: "Apache Lucene", libraryName: "lucene-core-2.4.1.jar", version: "2.4.1", license: "Apache 2.0",
                        url: "http://lucene.apache.org/java"),
-    new LibraryLicense(name: "ASM Bytecode Manipulation Framework", libraryName: "ASM", version: "6.0 (with patches by JetBrains)",
+    new LibraryLicense(name: "ASM Bytecode Manipulation Framework", libraryName: "ASM", version: "7.0 (with patches by JetBrains)",
                        license: "BSD", url: "http://asm.objectweb.org/", licenseUrl: "http://asm.objectweb.org/license.html",
                        additionalLibraryNames: ["asm-capture"]),
     new LibraryLicense(name: "ASM Tools", libraryName: "asm-tools", license: "BSD", url: "http://asm.objectweb.org/",