diff --git a/kotlin-native/konan/konan.properties b/kotlin-native/konan/konan.properties
index 2ed85a17a5d..f1cd4cc4c51 100644
--- a/kotlin-native/konan/konan.properties
+++ b/kotlin-native/konan/konan.properties
@@ -36,10 +36,10 @@ homeDependencyCache = .konan/cache
 reducedLlvmAppendix = compact
 
 predefinedLlvmDistributions = \
-  apple-llvm-20200714-macos-x64 \
-  apple-llvm-20200714-macos-aarch64 \
-  llvm-11.1.0-linux-x64-1 \
-  llvm-11.1.0-windows-x64 \
+  apple-llvm-20200714-macos-x64-1 \
+  apple-llvm-20200714-macos-aarch64-1 \
+  llvm-11.1.0-linux-x64-2 \
+  llvm-11.1.0-windows-x64-2 \
   apple-llvm-20200714-macos-x64-essentials \
   apple-llvm-20200714-macos-aarch64-essentials \
   llvm-11.1.0-linux-x64-essentials \
@@ -51,16 +51,16 @@ predefinedLibffiVersions = \
   libffi-3.2.1-2-linux-x86-64 \
   libffi-3.3-windows-x64-1
 
-llvm.linux_x64.dev = llvm-11.1.0-linux-x64-1
+llvm.linux_x64.dev = llvm-11.1.0-linux-x64-2
 llvm.linux_x64.user = llvm-11.1.0-linux-x64-essentials
 
-llvm.mingw_x64.dev = llvm-11.1.0-windows-x64
+llvm.mingw_x64.dev = llvm-11.1.0-windows-x64-2
 llvm.mingw_x64.user = llvm-11.1.0-windows-x64-essentials
 
-llvm.macos_x64.dev = apple-llvm-20200714-macos-x64
+llvm.macos_x64.dev = apple-llvm-20200714-macos-x64-1
 llvm.macos_x64.user = apple-llvm-20200714-macos-x64-essentials
 
-llvm.macos_arm64.dev = apple-llvm-20200714-macos-aarch64
+llvm.macos_arm64.dev = apple-llvm-20200714-macos-aarch64-1
 llvm.macos_arm64.user = apple-llvm-20200714-macos-aarch64-essentials
 
 # By default LLVM uses 250 for -03 builds.
diff --git a/kotlin-native/tools/llvm_builder/package.py b/kotlin-native/tools/llvm_builder/package.py
index e5374939c97..0b9da97a6e9 100644
--- a/kotlin-native/tools/llvm_builder/package.py
+++ b/kotlin-native/tools/llvm_builder/package.py
@@ -108,7 +108,10 @@ def construct_cmake_flags(
         '-DLLVM_ENABLE_Z3_SOLVER=OFF',
         '-DCOMPILER_RT_BUILD_BUILTINS=ON',
         '-DLLVM_ENABLE_THREADS=ON',
-        '-DLLVM_OPTIMIZED_TABLEGEN=ON'
+        '-DLLVM_OPTIMIZED_TABLEGEN=ON',
+        '-DLLVM_ENABLE_IDE=OFF',
+        '-DLLVM_BUILD_UTILS=ON',
+        '-DLLVM_INSTALL_UTILS=ON'
     ]
     if not building_bootstrap:
         if distribution_components: