diff --git a/build.xml b/build.xml
index 622966cb00f4ae5659f3e370f5ce2c9fa73b9578..bf08ab70386704171bd945d56c3542d2065b718e 100644
--- a/build.xml
+++ b/build.xml
@@ -180,9 +180,10 @@
           </then>
         </if>
         <!-- unpack the archive into solr/vendor -->
-        <untar file="${srcdir}/downloads/solr-${solr_version}.tgz" todir="${tmp}" />
+        <mkdir dir="${builddir}/solr" />
+        <untar file="${srcdir}/downloads/solr-${solr_version}.tgz" todir="${builddir}/solr" />
         <delete dir="${srcdir}/solr/vendor" includeemptydirs="true" failonerror="false" />
-        <move file="${tmp}/solr-${solr_version}" tofile="${srcdir}/solr/vendor" />
+        <move file="${builddir}/solr/solr-${solr_version}" tofile="${srcdir}/solr/vendor" />
         <!-- make scripts executable -->
         <chmod mode="0755">
           <fileset dir="${srcdir}/solr/vendor/bin">