diff --git a/build.xml b/build.xml
index 76075c4..af3339b 100644
--- a/build.xml
+++ b/build.xml
@@ -301,6 +301,7 @@
       <include name="org/apache/commons/logging/**" />
       <include name="META-INF/LICENSE.txt"/>
       <include name="META-INF/NOTICE.txt"/>
+      <exclude name="**/package.html"/>
     </jar>
 
     <jar jarfile="${build.home}/commons-${component.name}-api.jar"
@@ -313,6 +314,7 @@
       <include name="org/apache/commons/logging/impl/NoOpLog*.class" />
       <include name="META-INF/LICENSE.txt"/>
       <include name="META-INF/NOTICE.txt"/>
+      <exclude name="**/package.html"/>
     </jar>
   </target>
 
@@ -803,6 +805,7 @@ limitations under the License.--&gt;'>
 
     <echo message="Default Configuration (Log4J Auto-Recognized)"/>
     <java classname="${test.runner}" fork="yes" failonerror="${test.failonerror}">
+   <jvmarg value="-Dorg.apache.commons.logging.diagnostics.dest=/tmp/diag.txt"/>
       <arg value="org.apache.commons.logging.log4j.DefaultConfigTestCase"/>
       <classpath refid="test.classpath.log4j12"/>
     </java>