diff --git a/build/groovy/org/jetbrains/intellij/build/impl/BuildTasksImpl.groovy b/build/groovy/org/jetbrains/intellij/build/impl/BuildTasksImpl.groovy
index 30c574563313..e35b0932aa14 100644
--- a/build/groovy/org/jetbrains/intellij/build/impl/BuildTasksImpl.groovy
+++ b/build/groovy/org/jetbrains/intellij/build/impl/BuildTasksImpl.groovy
@@ -295,6 +295,12 @@ idea.fatal.error.notification=disabled
       else {
         buildContext.messages.warning("Scrambling skipped: 'scrambleTool' isn't defined")
       }
+      buildContext.ant.zip(destfile: "$buildContext.paths.artifacts/internalUtilities.zip") {
+        fileset(file: "$buildContext.paths.buildOutputRoot/internal/internalUtilities.jar")
+        fileset(dir: "$buildContext.paths.communityHome/lib") {
+          include(name: "junit-4*.jar")
+        }
+      }
     }
     buildDistributions()
   }
diff --git a/build/groovy/org/jetbrains/intellij/build/impl/DistributionJARsBuilder.groovy b/build/groovy/org/jetbrains/intellij/build/impl/DistributionJARsBuilder.groovy
index 47d50dbac27f..d6ff10a065f8 100644
--- a/build/groovy/org/jetbrains/intellij/build/impl/DistributionJARsBuilder.groovy
+++ b/build/groovy/org/jetbrains/intellij/build/impl/DistributionJARsBuilder.groovy
@@ -179,7 +179,7 @@ class DistributionJARsBuilder {
     }
 
     if (productProperties.scrambleMainJar) {
-      createLayoutBuilder().layout(buildContext.paths.artifacts) {
+      createLayoutBuilder().layout("$buildContext.paths.buildOutputRoot/internal") {
         jar("internalUtilities.jar") {
           module("internalUtilities")
         }