diff --git a/.idea/libraries/asm5.xml b/.idea/libraries/asm5.xml
index e4873676bb75..854ff78878b9 100644
--- a/.idea/libraries/asm5.xml
+++ b/.idea/libraries/asm5.xml
@@ -5,7 +5,7 @@
     </CLASSES>
     <JAVADOC />
     <SOURCES>
-      <root url="jar://$PROJECT_DIR$/lib/src/asm5-src.zip!/" />
+      <root url="jar://$PROJECT_DIR$/lib/src/asm-src.zip!/" />
     </SOURCES>
   </library>
 </component>
\ No newline at end of file
diff --git a/build/asm/1_version_check.patch b/build/asm/1_version_check.patch
index 63ec6e0278f8..45eb8373f4c7 100644
--- a/build/asm/1_version_check.patch
+++ b/build/asm/1_version_check.patch
@@ -5,7 +5,7 @@ Index: org/objectweb/asm/ClassReader.java
 @@ -167,7 +167,7 @@
          this.b = b;
          // checks the class version
-         if (readShort(off + 6) > Opcodes.V1_8) {
+         if (readShort(off + 6) > Opcodes.V1_9) {
 -            throw new IllegalArgumentException();
 +            //[JB: accept any version] throw new IllegalArgumentException();
          }
diff --git a/build/asm/repackage.xml b/build/asm/repackage.xml
index 75336cfbe16b..6d72c6d4c53a 100644
--- a/build/asm/repackage.xml
+++ b/build/asm/repackage.xml
@@ -19,7 +19,7 @@
 
   <property name="src.dir" value="${basedir}/src"/>
   <property name="out.dir" value="${basedir}/out"/>
-  <property name="src.zip" value="${basedir}/asm5-src.zip"/>
+  <property name="src.zip" value="${basedir}/asm-src.zip"/>
   <property name="out.jar" value="${basedir}/asm-all.jar"/>
 
   <target name="check">
@@ -41,6 +41,7 @@
   <target name="patch" depends="unpack">
     <patch dir="${src.dir}" strip="0" patchfile="1_version_check.patch" failonerror="true"/>
     <patch dir="${src.dir}" strip="0" patchfile="2_coverage_fix.patch" failonerror="true"/>
+    <delete file="${src.dir}/org/objectweb/asm/optimizer/ModuleInfoBndPlugin.java" quiet="true"/>
   </target>
 
   <target name="repackage" depends="patch">
diff --git a/build/scripts/libLicenses.gant b/build/scripts/libLicenses.gant
index 88f3bf933756..207b39cb31ef 100644
--- a/build/scripts/libLicenses.gant
+++ b/build/scripts/libLicenses.gant
@@ -175,7 +175,7 @@ libraryLicense(name: "asm-4.0-all", libraryName: "asm-4.0-all", version: "4.0",
 libraryLicense(name: "ASM Bytecode Manipulation Framework", libraryName: "asm-tools", version: "4.0", license: "BSD", url: "http://asm.objectweb.org/", licenseUrl: "http://asm.objectweb.org/license.html")
 libraryLicense(name: "ASM Bytecode Manipulation Framework", libraryName: "asm", version: "3.3", license: "BSD", url: "http://asm.objectweb.org/", licenseUrl: "http://asm.objectweb.org/license.html")
 libraryLicense(name: "ASM Bytecode Manipulation Framework", libraryName: "asm4", version: "4.0", license: "BSD", url: "http://asm.objectweb.org/", licenseUrl: "http://asm.objectweb.org/license.html")
-libraryLicense(name: "ASM Bytecode Manipulation Framework", libraryName: "asm5", version: "5.0.3 (with patches by JetBrains)", license: "BSD", url: "http://asm.objectweb.org/", licenseUrl: "http://asm.objectweb.org/license.html")
+libraryLicense(name: "ASM Bytecode Manipulation Framework", libraryName: "asm5", version: "6.0-ALPHA (with patches by JetBrains)", license: "BSD", url: "http://asm.objectweb.org/", licenseUrl: "http://asm.objectweb.org/license.html")
 libraryLicense(name: "assertJ", version: "3", license: "Apache 2.0", url: "https://github.com/joel-costigliola/assertj-core")
 libraryLicense(name: "Automaton", libraryName: "automaton.jar", version: "1.11", license: "BSD", url: "http://www.brics.dk/automaton/", licenseUrl: "http://www.opensource.org/licenses/bsd-license.php")
 libraryLicense(name: "Axis", libraryName: "axis-1.4", version: "1.4", license: "Apache 2.0", url: "http://ws.apache.org/axis/", licenseUrl: "http://www.apache.org/licenses/LICENSE-2.0.html")
diff --git a/lib/asm-all.jar b/lib/asm-all.jar
index b2f2849bae45..12f25c2c4220 100644
Binary files a/lib/asm-all.jar and b/lib/asm-all.jar differ
diff --git a/lib/src/asm5-src.zip b/lib/src/asm-src.zip
similarity index 57%
rename from lib/src/asm5-src.zip
rename to lib/src/asm-src.zip
index ad405c1ca3e2..26dd8efc7fef 100644
Binary files a/lib/src/asm5-src.zip and b/lib/src/asm-src.zip differ