--- apache-tomcat-6.0.36-src/build.xml
+++ apache-tomcat-6.0.36-src/build.xml
@@ -487,13 +487,6 @@
 
   <target name="deploy" depends="build-only,build-docs,warn.dbcp">
 
-    <copy tofile="${tomcat.build}/bin/tomcat-native.tar.gz"
-            file="${tomcat-native.tar.gz}" />
-    <copy tofile="${tomcat.build}/bin/commons-daemon-native.tar.gz"
-            file="${commons-daemon.native.src.tgz}" />
-
-    <copy tofile="${tomcat.build}/bin/commons-daemon.jar" file="${commons-daemon.jar}" />
-
     <!-- Copy scripts -->
     <copy todir="${tomcat.build}/bin">
       <fileset dir="bin">
@@ -777,41 +770,6 @@
           description="Download (and build as necessary) dependent components"
           depends="build-manifests">
 
-    <antcall target="downloadfile-2">
-      <param name="sourcefile.1" value="${tomcat-native.loc.1}"/>
-      <param name="sourcefile.2" value="${tomcat-native.loc.2}"/>
-      <param name="destfile" value="${tomcat-native.tar.gz}"/>
-      <param name="destdir" value="${tomcat-native.home}"/>
-    </antcall>
-
-    <antcall target="downloadzip-2">
-      <param name="sourcefile.1" value="${tomcat-native.win.1}"/>
-      <param name="sourcefile.2" value="${tomcat-native.win.2}"/>
-      <param name="destfile" value="${tomcat-native.home}/LICENSE"/>
-      <param name="destdir" value="${tomcat-native.home}"/>
-    </antcall>
-
-    <!-- Download Commons Daemon -->
-    <antcall target="downloadgz-2">
-      <param name="sourcefile.1" value="${commons-daemon.bin.loc.1}"/>
-      <param name="sourcefile.2" value="${commons-daemon.bin.loc.2}"/>
-      <param name="destfile" value="${commons-daemon.jar}"/>
-    </antcall>
-
-    <antcall target="downloadfile-2">
-      <param name="sourcefile.1" value="${commons-daemon.native.src.loc.1}"/>
-      <param name="sourcefile.2" value="${commons-daemon.native.src.loc.2}"/>
-      <param name="destfile" value="${commons-daemon.native.src.tgz}"/>
-      <param name="destdir" value="${commons-daemon.home}"/>
-    </antcall>
-
-    <antcall target="downloadzip-2">
-      <param name="sourcefile.1" value="${commons-daemon.native.win.loc.1}"/>
-      <param name="sourcefile.2" value="${commons-daemon.native.win.loc.2}"/>
-      <param name="destfile" value="${commons-daemon.native.win.mgr.exe}"/>
-      <param name="destdir" value="${commons-daemon.native.win.home}"/>
-    </antcall>
-
     <!-- Build Tomcat DBCP bundle -->
     <antcall target="downloadgz-2">
       <param name="sourcefile.1" value="${commons-pool-src.loc.1}"/>
@@ -823,6 +781,11 @@
       <param name="sourcefile.2" value="${commons-dbcp-src.loc.2}"/>
       <param name="destfile" value="${commons-dbcp.home}/build.xml" />
     </antcall>
+    <!-- We need to patch DBCP so it can be built with JDK 1.7. -->
+    <exec executable="sh">
+      <arg value="-c" />
+      <arg value="cat ../../jdbc41.patch | gpatch -d ${commons-dbcp.home} -p0" />
+    </exec>
     <mkdir dir="${tomcat-dbcp.home}"/>
     <antcall target="build-tomcat-dbcp">
       <param name="basedir" value="${tomcat-dbcp.home}" />
@@ -836,15 +799,9 @@
       <param name="destdir" value="${jdt.home}"/>
     </antcall>
 
-    <antcall target="downloadzip">
-      <param name="sourcefile" value="${nsis.loc}"/>
-      <param name="destfile" value="${nsis.exe}"/>
-      <param name="destdir" value="${nsis.home}/.."/>
-    </antcall>
-
   </target>
 
-  <target name="build-tomcat-dbcp" unless="jdk16.present"
+  <target name="build-tomcat-dbcp"
           depends="build-manifests">
     <copy todir="${tomcat-dbcp.home}">
       <fileset dir="${commons-pool.home}">