diff --git a/build.xml b/build.xml
index c18e71c4903..62c1b6ff598 100644
--- a/build.xml
+++ b/build.xml
@@ -91,44 +91,50 @@
         </java>
     </target>
 
-    <target name="compilerSources" if="generate.javadoc">
-        <jar jarfile="${output}/kotlin-compiler-sources.jar">
-            <!-- TODO How to convert it from pathset or dirset ? -->
-            <fileset dir="compiler/frontend/src"/>
-            <fileset dir="compiler/frontend.java/src"/>
-            <fileset dir="compiler/backend/src"/>
-            <fileset dir="compiler/cli/src"/>
-            <fileset dir="compiler/util/src"/>
-            <fileset dir="compiler/jet.as.java.psi/src"/>
-            <fileset dir="runtime/src"/>
-            <fileset dir="js/js.translator/src"/>
+    <target name="compilerSources">
+        <if>
+            <istrue value="${generate.javadoc}"/>
 
-            <manifest>
-                <attribute name="Built-By" value="JetBrains"/>
+            <then>
+                <jar jarfile="${output}/kotlin-compiler-sources.jar">
+                    <!-- TODO How to convert it from pathset or dirset ? -->
+                    <fileset dir="compiler/frontend/src"/>
+                    <fileset dir="compiler/frontend.java/src"/>
+                    <fileset dir="compiler/backend/src"/>
+                    <fileset dir="compiler/cli/src"/>
+                    <fileset dir="compiler/util/src"/>
+                    <fileset dir="compiler/jet.as.java.psi/src"/>
+                    <fileset dir="runtime/src"/>
+                    <fileset dir="js/js.translator/src"/>
 
-                <attribute name="Implementation-Vendor" value="JetBrains"/>
-                <attribute name="Implementation-Title" value="Kotlin Compiler Sources"/>
-                <attribute name="Implementation-Version" value="${build.number}"/>
-            </manifest>
-        </jar>
+                    <manifest>
+                        <attribute name="Built-By" value="JetBrains"/>
 
-        <delete dir="${output}/kotlin-compiler-javadoc" failonerror="false" />
-        <javadoc destdir="${output}/kotlin-compiler-javadoc"
-                 sourcepathref="compilerSources.path"
-                 classpathref="classpath"
-                 linksource="yes"
-                 windowtitle="Kotlin Compiler"/>
-        <jar jarfile="${output}/kotlin-compiler-javadoc.jar">
-            <fileset dir="${output}/kotlin-compiler-javadoc"/>
+                        <attribute name="Implementation-Vendor" value="JetBrains"/>
+                        <attribute name="Implementation-Title" value="Kotlin Compiler Sources"/>
+                        <attribute name="Implementation-Version" value="${build.number}"/>
+                    </manifest>
+                </jar>
 
-            <manifest>
-                <attribute name="Built-By" value="JetBrains"/>
+                <delete dir="${output}/kotlin-compiler-javadoc" failonerror="false" />
+                <javadoc destdir="${output}/kotlin-compiler-javadoc"
+                         sourcepathref="compilerSources.path"
+                         classpathref="classpath"
+                         linksource="yes"
+                         windowtitle="Kotlin Compiler"/>
+                <jar jarfile="${output}/kotlin-compiler-javadoc.jar">
+                    <fileset dir="${output}/kotlin-compiler-javadoc"/>
 
-                <attribute name="Implementation-Vendor" value="JetBrains"/>
-                <attribute name="Implementation-Title" value="Kotlin Compiler Javadoc"/>
-                <attribute name="Implementation-Version" value="${build.number}"/>
-            </manifest>
-        </jar>
+                    <manifest>
+                        <attribute name="Built-By" value="JetBrains"/>
+
+                        <attribute name="Implementation-Vendor" value="JetBrains"/>
+                        <attribute name="Implementation-Title" value="Kotlin Compiler Javadoc"/>
+                        <attribute name="Implementation-Version" value="${build.number}"/>
+                    </manifest>
+                </jar>
+            </then>
+        </if>
     </target>
 
     <target name="compiler">