diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index c5c6d6bbcc2..93fe54bb34d 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -78,6 +78,7 @@ extra["customDepsOrg"] = "kotlin.build.custom.deps"
 repositories {
     if (cacheRedirectorEnabled) {
         maven("https://cache-redirector.jetbrains.com/jcenter.bintray.com")
+        maven("https://cache-redirector.jetbrains.com/jetbrains.bintray.com/intellij-third-party-dependencies/")
     }
 
     extra["buildSrcKotlinRepo"]?.let {
@@ -85,6 +86,7 @@ repositories {
     }
 
     jcenter()
+    maven("https://jetbrains.bintray.com/intellij-third-party-dependencies/")
 }
 
 dependencies {
@@ -94,7 +96,7 @@ dependencies {
     compile("com.jakewharton.dex:dex-method-list:3.0.0")
 
     compile("com.github.jengelman.gradle.plugins:shadow:${property("versions.shadow")}")
-    compile("org.ow2.asm:asm-all:6.0_BETA")
+    compile("org.jetbrains.intellij.deps:asm-all:7.0")
 }
 
 samWithReceiver {
diff --git a/buildSrc/src/main/kotlin/stripMetadata.kt b/buildSrc/src/main/kotlin/stripMetadata.kt
index dfca8f72078..f120665873d 100644
--- a/buildSrc/src/main/kotlin/stripMetadata.kt
+++ b/buildSrc/src/main/kotlin/stripMetadata.kt
@@ -1,7 +1,7 @@
 @file:Suppress("unused") // usages in build scripts are not tracked properly
 
 import org.gradle.api.logging.Logger
-import org.objectweb.asm.*
+import org.jetbrains.org.objectweb.asm.*
 import java.io.BufferedOutputStream
 import java.io.File
 import java.io.FileOutputStream
@@ -23,7 +23,7 @@ fun stripMetadata(logger: Logger, classNamePattern: String, inFile: File, outFil
 
         var changed = false
         val classWriter = ClassWriter(0)
-        val classVisitor = object : ClassVisitor(Opcodes.ASM5, classWriter) {
+        val classVisitor = object : ClassVisitor(Opcodes.API_VERSION, classWriter) {
             override fun visitAnnotation(desc: String, visible: Boolean): AnnotationVisitor? {
                 if (Type.getType(desc).internalName == "kotlin/Metadata") {
                     changed = true
diff --git a/libraries/tools/kotlinp/src/org/jetbrains/kotlin/kotlinp/readKotlinClassHeader.kt b/libraries/tools/kotlinp/src/org/jetbrains/kotlin/kotlinp/readKotlinClassHeader.kt
index 58091b4e0b6..8a8fe331a12 100644
--- a/libraries/tools/kotlinp/src/org/jetbrains/kotlin/kotlinp/readKotlinClassHeader.kt
+++ b/libraries/tools/kotlinp/src/org/jetbrains/kotlin/kotlinp/readKotlinClassHeader.kt
@@ -28,7 +28,7 @@ internal fun File.readKotlinClassHeader(): KotlinClassHeader? {
 }
 
 private fun readMetadataVisitor(output: (KotlinClassHeader) -> Unit): AnnotationVisitor =
-    object : AnnotationVisitor(Opcodes.ASM7) {
+    object : AnnotationVisitor(Opcodes.API_VERSION) {
         var kind: Int? = null
         var metadataVersion: IntArray? = null
         var bytecodeVersion: IntArray? = null
@@ -57,7 +57,7 @@ private fun readMetadataVisitor(output: (KotlinClassHeader) -> Unit): Annotation
             }
 
         private fun stringArrayVisitor(output: (Array<String>) -> Unit): AnnotationVisitor {
-            return object : AnnotationVisitor(Opcodes.ASM7) {
+            return object : AnnotationVisitor(Opcodes.API_VERSION) {
                 val strings = mutableListOf<String>()
 
                 override fun visit(name: String?, value: Any?) {