diff --git a/cmd/run_konan.bat b/cmd/run_konan.bat
index 4d339261da0..fbc368a0c3e 100644
--- a/cmd/run_konan.bat
+++ b/cmd/run_konan.bat
@@ -100,7 +100,7 @@ goto :eof
   rem libclang.dll is dynamically linked and thus requires correct PATH to be loaded.
   rem TODO: remove this hack.
   if "%KONAN_DATA_DIR%"=="" (set KONAN_DATA_DIR=%USERPROFILE%\.konan)
-  set "PATH=%KONAN_DATA_DIR%\dependencies\msys2-mingw-w64-x86_64-gcc-7.3.0-clang-llvm-lld-6.0.1\bin;%PATH%"
+  set "PATH=%KONAN_DATA_DIR%\dependencies\msys2-mingw-w64-x86_64-gcc-7.3.0-clang-llvm-lld-6.0.1-2\bin;%PATH%"
 goto :eof
 
 :end
diff --git a/gradle.properties b/gradle.properties
index 57cd1fa0c98..ae65346f5c5 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -22,8 +22,8 @@ kotlinCompilerRepo=https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buil
 kotlinVersion=1.3.50-dev-259
 testKotlinVersion=1.3.50-dev-259
 # See https://teamcity.jetbrains.com/project.html?projectId=Kotlin_KotlinNativeShared&tab=projectOverview
-sharedRepo=https://dl.bintray.com/jetbrains/kotlin-native-dependencies
-sharedVersion=1.0-dev-57
+sharedRepo=https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_KotlinNativeShared_BuildAndTest),number:1.0-dev-61,branch:mingw_android_arm64/artifacts/content/maven
+sharedVersion=1.0-dev-61
 konanVersion=1.3.0
 org.gradle.jvmargs='-Dfile.encoding=UTF-8'
 org.gradle.workers.max=4
diff --git a/konan/konan.properties b/konan/konan.properties
index 733f84a6499..1006927e372 100644
--- a/konan/konan.properties
+++ b/konan/konan.properties
@@ -166,9 +166,9 @@ dependencies.linux_x64 = \
     libffi-3.2.1-2-linux-x86-64
 
 gccToolchain.mingw_x64 = target-gcc-toolchain-3-linux-x86-64
-targetToolchain.mingw_x64-linux_x64 = msys2-mingw-w64-x86_64-gcc-7.3.0-clang-llvm-lld-6.0.1
+targetToolchain.mingw_x64-linux_x64 = msys2-mingw-w64-x86_64-gcc-7.3.0-clang-llvm-lld-6.0.1-2
 dependencies.mingw_x64-linux_x64 = \
-    msys2-mingw-w64-x86_64-gcc-7.3.0-clang-llvm-lld-6.0.1 \
+    msys2-mingw-w64-x86_64-gcc-7.3.0-clang-llvm-lld-6.0.1-2 \
     libffi-3.2.1-mingw-w64-x86-64 \
     target-gcc-toolchain-3-linux-x86-64
 
@@ -201,7 +201,7 @@ abiSpecificLibraries.linux_x64 = ../lib64 lib64 usr/lib64
 
 # Raspberry Pi
 targetToolchain.linux_x64-linux_arm32_hfp = target-gcc-toolchain-3-linux-x86-64/x86_64-unknown-linux-gnu
-targetToolchain.mingw_x64-linux_arm32_hfp = msys2-mingw-w64-x86_64-gcc-7.3.0-clang-llvm-lld-6.0.1
+targetToolchain.mingw_x64-linux_arm32_hfp = msys2-mingw-w64-x86_64-gcc-7.3.0-clang-llvm-lld-6.0.1-2
 targetToolchain.macos_x64-linux_arm32_hfp = clang-llvm-6.0.1-darwin-macos
 dependencies.linux_x64-linux_arm32_hfp = \
     clang-llvm-6.0.1-linux-x86-64 \
@@ -209,7 +209,7 @@ dependencies.linux_x64-linux_arm32_hfp = \
     target-sysroot-2-raspberrypi \
     libffi-3.2.1-2-linux-x86-64
 dependencies.mingw_x64-linux_arm32_hfp = \
-    msys2-mingw-w64-x86_64-gcc-7.3.0-clang-llvm-lld-6.0.1 \
+    msys2-mingw-w64-x86_64-gcc-7.3.0-clang-llvm-lld-6.0.1-2 \
     libffi-3.2.1-mingw-w64-x86-64 \
     target-gcc-toolchain-3-linux-x86-64 \
     target-sysroot-2-raspberrypi
@@ -243,7 +243,7 @@ abiSpecificLibraries.linux_arm32_hfp = \
 
 # Linux arm64
 targetToolchain.linux_x64-linux_arm64 = target-gcc-toolchain-3-linux-x86-64/x86_64-unknown-linux-gnu
-targetToolchain.mingw_x64-linux_arm64 = msys2-mingw-w64-x86_64-gcc-7.3.0-clang-llvm-lld-6.0.1
+targetToolchain.mingw_x64-linux_arm64 = msys2-mingw-w64-x86_64-gcc-7.3.0-clang-llvm-lld-6.0.1-2
 targetToolchain.macos_x64-linux_arm64 = clang-llvm-6.0.1-darwin-macos
 dependencies.linux_x64-linux_arm64 = \
     clang-llvm-6.0.1-linux-x86-64 \
@@ -251,7 +251,7 @@ dependencies.linux_x64-linux_arm64 = \
     target-sysroot-1-linux-glibc-arm64 \
     libffi-3.2.1-2-linux-x86-64
 dependencies.mingw_x64-linux_arm64 = \
-    msys2-mingw-w64-x86_64-gcc-7.3.0-clang-llvm-lld-6.0.1 \
+    msys2-mingw-w64-x86_64-gcc-7.3.0-clang-llvm-lld-6.0.1-2 \
     libffi-3.2.1-mingw-w64-x86-64 \
     target-gcc-toolchain-3-linux-x86-64 \
     target-sysroot-1-linux-glibc-arm64
@@ -352,7 +352,7 @@ dependencies.linux_x64-android_arm32 = \
     libffi-3.2.1-2-linux-x86-64
 targetToolchain.mingw_x64-android_arm32 = target-toolchain-21-windows-android_arm32
 dependencies.mingw_x64-android_arm32 = \
-    msys2-mingw-w64-x86_64-gcc-7.3.0-clang-llvm-lld-6.0.1 \
+    msys2-mingw-w64-x86_64-gcc-7.3.0-clang-llvm-lld-6.0.1-2 \
     target-sysroot-21-android_arm32 \
     target-toolchain-21-windows-android_arm32 \
     libffi-3.2.1-mingw-w64-x86-64
@@ -382,7 +382,7 @@ dependencies.linux_x64-android_arm64 = \
     libffi-3.2.1-2-linux-x86-64
 targetToolchain.mingw_x64-android_arm64 = target-toolchain-21-windows-android_arm64
 dependencies.mingw_x64-android_arm64 = \
-    msys2-mingw-w64-x86_64-gcc-7.3.0-clang-llvm-lld-6.0.1 \
+    msys2-mingw-w64-x86_64-gcc-7.3.0-clang-llvm-lld-6.0.1-2 \
     target-sysroot-21-android_arm64 \
     target-toolchain-21-windows-android_arm64 \
     libffi-3.2.1-mingw-w64-x86-64
@@ -395,26 +395,26 @@ linkerKonanFlags.android_arm64 = -lm -latomic -lstdc++ -landroid
 linkerNoDebugFlags.android_arm64 = -Wl,-S
 
 # Windows x86-64, based on mingw-w64.
-llvmHome.mingw_x64 = msys2-mingw-w64-x86_64-gcc-7.3.0-clang-llvm-lld-6.0.1
-targetToolchain.mingw_x64 = msys2-mingw-w64-x86_64-gcc-7.3.0-clang-llvm-lld-6.0.1
+llvmHome.mingw_x64 = msys2-mingw-w64-x86_64-gcc-7.3.0-clang-llvm-lld-6.0.1-2
+targetToolchain.mingw_x64 = msys2-mingw-w64-x86_64-gcc-7.3.0-clang-llvm-lld-6.0.1-2
 libffiDir.mingw_x64 = libffi-3.2.1-mingw-w64-x86-64
 
-targetToolchain.linux_x64-mingw_x64 = msys2-mingw-w64-x86_64-gcc-7.3.0-clang-llvm-lld-6.0.1
-targetToolchain.macos_x64-mingw_x64 = msys2-mingw-w64-x86_64-gcc-7.3.0-clang-llvm-lld-6.0.1
+targetToolchain.linux_x64-mingw_x64 = msys2-mingw-w64-x86_64-gcc-7.3.0-clang-llvm-lld-6.0.1-2
+targetToolchain.macos_x64-mingw_x64 = msys2-mingw-w64-x86_64-gcc-7.3.0-clang-llvm-lld-6.0.1-2
 dependencies.mingw_x64 = \
-    msys2-mingw-w64-x86_64-gcc-7.3.0-clang-llvm-lld-6.0.1 \
+    msys2-mingw-w64-x86_64-gcc-7.3.0-clang-llvm-lld-6.0.1-2 \
     libffi-3.2.1-mingw-w64-x86-64
 dependencies.linux_x64-mingw_x64 = \
-    msys2-mingw-w64-x86_64-gcc-7.3.0-clang-llvm-lld-6.0.1 \
+    msys2-mingw-w64-x86_64-gcc-7.3.0-clang-llvm-lld-6.0.1-2 \
     clang-llvm-6.0.1-linux-x86-64 \
     libffi-3.2.1-2-linux-x86-64
 dependencies.macos_x64-mingw_x64 = \
-    msys2-mingw-w64-x86_64-gcc-7.3.0-clang-llvm-lld-6.0.1 \
+    msys2-mingw-w64-x86_64-gcc-7.3.0-clang-llvm-lld-6.0.1-2 \
     clang-llvm-6.0.1-darwin-macos \
     libffi-3.2.1-3-darwin-macos
 
 quadruple.mingw_x64 = x86_64-w64-mingw32
-targetSysRoot.mingw_x64 = msys2-mingw-w64-x86_64-gcc-7.3.0-clang-llvm-lld-6.0.1
+targetSysRoot.mingw_x64 = msys2-mingw-w64-x86_64-gcc-7.3.0-clang-llvm-lld-6.0.1-2
 # For using with Universal Windows Platform (UWP) we need to use this slower option.
 # See https://youtrack.jetbrains.com/issue/KT-27654.
 # TODO: remove, once fixed in mingw, check with the bug testcase.
@@ -434,7 +434,7 @@ entrySelector.mingw_x64 = -Wl,--defsym,main=Konan_main
 targetToolchain.mingw_x64-mingw_x86 = msys2-mingw-w64-i686-gcc-7.4.0-clang-llvm-6.0.1
 dependencies.mingw_x64-mingw_x86 = \
     msys2-mingw-w64-i686-gcc-7.4.0-clang-llvm-6.0.1 \
-    msys2-mingw-w64-x86_64-gcc-7.3.0-clang-llvm-lld-6.0.1 \
+    msys2-mingw-w64-x86_64-gcc-7.3.0-clang-llvm-lld-6.0.1-2 \
     libffi-3.2.1-mingw-w64-x86-64
 targetToolchain.linux_x64-mingw_x86 = msys2-mingw-w64-i686-gcc-7.4.0-clang-llvm-6.0.1
 targetToolchain.macos_x64-mingw_x86 = msys2-mingw-w64-i686-gcc-7.4.0-clang-llvm-6.0.1
@@ -486,7 +486,7 @@ dependencies.linux_x64-wasm32 = \
 targetToolchain.mingw_x64-wasm32 = target-toolchain-2-mingw-wasm
 dependencies.mingw_x64-wasm32 = \
     libffi-3.2.1-mingw-w64-x86-64 \
-    msys2-mingw-w64-x86_64-gcc-7.3.0-clang-llvm-lld-6.0.1 \
+    msys2-mingw-w64-x86_64-gcc-7.3.0-clang-llvm-lld-6.0.1-2 \
     target-sysroot-2-wasm \
     target-toolchain-2-mingw-wasm
 
diff --git a/konan/platforms/zephyr/stm32f4_disco b/konan/platforms/zephyr/stm32f4_disco
index 4a6f0b5ed36..103f693b4db 100644
--- a/konan/platforms/zephyr/stm32f4_disco
+++ b/konan/platforms/zephyr/stm32f4_disco
@@ -40,6 +40,6 @@ dependencies.macos_x64-zephyr_stm32f4_disco = \
 targetToolchain.mingw_x64-zephyr_stm32f4_disco = gcc-arm-none-eabi-7-2017-q4-major-win32/arm-none-eabi
 dependencies.mingw_x64-zephyr_stm32f4_disco = \
     libffi-3.2.1-mingw-w64-x86-64 \
-    msys2-mingw-w64-x86_64-gcc-7.3.0-clang-llvm-lld-6.0.1 \
+    msys2-mingw-w64-x86_64-gcc-7.3.0-clang-llvm-lld-6.0.1-2 \
     gcc-arm-none-eabi-7-2017-q4-major-win32 \
     target-sysroot-2-wasm
diff --git a/samples/tetris/build.gradle b/samples/tetris/build.gradle
index 7bdb54b314b..4508c917035 100644
--- a/samples/tetris/build.gradle
+++ b/samples/tetris/build.gradle
@@ -68,7 +68,7 @@ if ((hostPreset == kotlin.presets.mingwX86) || (hostPreset == kotlin.presets.min
         if (hostPreset == kotlin.presets.mingwX86)
             windresDir = "${MPPTools.kotlinNativeDataPath()}/dependencies/msys2-mingw-w64-i686-gcc-7.4.0-clang-llvm-6.0.1/bin"
         else
-            windresDir = "${MPPTools.kotlinNativeDataPath()}/dependencies/msys2-mingw-w64-x86_64-gcc-7.3.0-clang-llvm-lld-6.0.1/bin"
+            windresDir = "${MPPTools.kotlinNativeDataPath()}/dependencies/msys2-mingw-w64-x86_64-gcc-7.3.0-clang-llvm-lld-6.0.1-2/bin"
         assert windresDir != null
 
         def winResourceFile = kotlin.sourceSets.tetrisMain.resources.files.find { it.name == 'Tetris.rc' }
diff --git a/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/konan/KonanToolRunner.kt b/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/konan/KonanToolRunner.kt
index 37c56641fe2..02fdce29735 100644
--- a/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/konan/KonanToolRunner.kt
+++ b/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/konan/KonanToolRunner.kt
@@ -133,7 +133,7 @@ internal class KonanInteropRunner(project: Project, additionalJvmArgs: List<Stri
         if (HostManager.host == KonanTarget.MINGW_X64) {
 	    //TODO: Oh-ho-ho fix it in more convinient way.
             environment.put("PATH", DependencyProcessor.defaultDependenciesRoot.absolutePath +
-                    "\\msys2-mingw-w64-x86_64-gcc-7.3.0-clang-llvm-lld-6.0.1" +
+                    "\\msys2-mingw-w64-x86_64-gcc-7.3.0-clang-llvm-lld-6.0.1-2" +
                     "\\bin;${environment.get("PATH")}")
         }
     }