diff --git a/build.xml b/build.xml
index b252a2e4ff4..1b8095a042f 100644
--- a/build.xml
+++ b/build.xml
@@ -17,13 +17,13 @@
     <property name="bootstrap.runtime" value="${bootstrap.compiler.home}/lib/kotlin-runtime.jar"/>
     <property name="bootstrap.runtime.minimal" value="${bootstrap.compiler.home}/lib/kotlin-runtime-minimal.jar"/>
 
-    <property name="output.relative" value="dist"/>
-    <property name="output" value="${basedir}/${output.relative}"/>
+    <property name="output" value="${basedir}/dist"/>
     <property name="kotlin-home" value="${output}/kotlinc"/>
     <property name="build.number" value="snapshot"/>
     <property name="bootstrap.build.no.tests" value="false"/>
-    <property name="output.name" value="kotlin-compiler-${build.number}"/>
     <property name="idea.sdk" value="${basedir}/ideaSDK"/>
+    <property name="protobuf.jar" value="${idea.sdk}/lib/protobuf-2.5.0.jar"/>
+    <property name="javax.inject.jar" value="${basedir}/lib/javax.inject.jar"/>
 
     <property name="java.target" value="1.6"/>
 
@@ -58,7 +58,7 @@
     <path id="classpath">
         <file file="${bootstrap.runtime}"/>
         <fileset dir="${idea.sdk}" includes="core/*.jar"/>
-        <fileset dir="${idea.sdk}" includes="lib/protobuf-2.5.0.jar"/>
+        <pathelement location="${protobuf.jar}"/>
 
         <fileset dir="${basedir}/lib" includes="**/*.jar"/>
         <fileset dir="${dependencies.dir}" includes="jline.jar"/>
@@ -437,12 +437,12 @@
 
                 <zipgroupfileset dir="${basedir}/lib" includes="*.jar"/>
                 <zipgroupfileset dir="${basedir}/ideaSDK/core" includes="*.jar" excludes="util.jar"/>
-                <zipgroupfileset dir="${basedir}/ideaSDK/lib" includes="jna-utils.jar"/>
-                <zipgroupfileset dir="${basedir}/ideaSDK/lib" includes="oromatcher.jar"/>
-                <zipgroupfileset dir="${basedir}/ideaSDK/lib" includes="protobuf-2.5.0.jar"/>
-                <zipgroupfileset dir="${basedir}/ideaSDK/jps" includes="jps-model.jar"/>
-                <zipgroupfileset dir="${dependencies.dir}" includes="jline.jar"/>
-                <zipgroupfileset dir="${dependencies.dir}" includes="cli-parser-1.1.1.jar"/>
+                <zipfileset src="${idea.sdk}/lib/jna-utils.jar"/>
+                <zipfileset src="${idea.sdk}/lib/oromatcher.jar"/>
+                <zipfileset src="${idea.sdk}/jps/jps-model.jar"/>
+                <zipfileset src="${dependencies.dir}/jline.jar"/>
+                <zipfileset src="${dependencies.dir}/cli-parser-1.1.1.jar"/>
+                <zipfileset src="${protobuf.jar}"/>
 
                 <manifest>
                     <attribute name="Built-By" value="${manifest.impl.vendor}"/>
@@ -778,7 +778,7 @@
                 <include name="libraries/stdlib/src"/>
             </src>
             <class-path>
-                <pathelement path="${output.relative}/classes/builtins"/>
+                <pathelement path="${output}/classes/builtins"/>
             </class-path>
         </new-kotlinc>
     </target>
@@ -789,8 +789,8 @@
                 <include name="core/reflection.jvm/src"/>
             </src>
             <class-path>
-                <pathelement path="${output.relative}/classes/builtins"/>
-                <pathelement path="${output.relative}/classes/stdlib"/>
+                <pathelement path="${output}/classes/builtins"/>
+                <pathelement path="${output}/classes/stdlib"/>
             </class-path>
         </new-kotlinc>
     </target>
@@ -880,7 +880,7 @@
             description="Builds compiler jar from project out dir"/>
 
     <target name="zip-compiler">
-        <zip destfile="${output}/${output.name}.zip">
+        <zip destfile="${output}/kotlin-compiler-${build.number}.zip">
             <zipfileset prefix="kotlinc" dir="${kotlin-home}" excludes="bin/*"/>
             <zipfileset prefix="kotlinc/bin" dir="${kotlin-home}/bin" includes="*.bat" filemode="644"/>
             <zipfileset prefix="kotlinc/bin" dir="${kotlin-home}/bin" excludes="*.bat" filemode="755"/>