diff --git a/build.xml b/build.xml
index 73bb58f6391..2f8d4cae4c4 100644
--- a/build.xml
+++ b/build.xml
@@ -489,6 +489,13 @@
         <attribute name="compress" default="true"/>
 
         <sequential>
+            <local name="idea.core.uberjar.exists"/>
+            <available file="${dependencies.dir}/idea/idea-core-all.jar" property="idea.core.uberjar.exists"/>
+            <!-- TODO: move this jar creation to update_dependencies.xml eventually -->
+            <jar jarfile="${dependencies.dir}/idea/idea-core-all.jar" unless:true="${idea.core.uberjar.exists}">
+                <zipgroupfileset dir="${idea.sdk}/core" includes="*.jar" excludes="util.jar"/>
+            </jar>
+
             <jar jarfile="@{jarfile}" compress="@{compress}" duplicate="preserve">
                 <fileset dir="${output}/classes/compiler"/>
                 <fileset dir="${output}/builtins">
@@ -507,7 +514,7 @@
                 </fileset>
 
                 <zipgroupfileset dir="${basedir}/lib" includes="*.jar"/>
-                <zipgroupfileset dir="${basedir}/ideaSDK/core" includes="*.jar" excludes="util.jar"/>
+                <zipfileset src="${dependencies.dir}/idea/idea-core-all.jar" excludes="META-INF/INDEX.LIST"/>
                 <zipfileset src="${idea.sdk}/lib/jna-platform.jar"/>
                 <zipfileset src="${idea.sdk}/lib/oromatcher.jar"/>
                 <zipfileset src="${idea.sdk}/jps/jps-model.jar"/>