--- a/build.xml
+++ b/build.xml
@@ -1,5 +1,16 @@
-<project default="jars">
-    <property file="build.properties"/>
+<project default="jars">
+    <property name="build.javadoc.subdir" value="javadoc"/>
+
+    <target name="debian-clean" depends="clean">
+    </target>
+
+    <target name="debian-build">
+    </target>
+
+    <target name="debian-install" depends="core.jar,javadoc">
+    </target>
+
+    <property file="build.properties"/>
 
     <property name="lib.dir" value="lib"/>
     <property name="examples.dir" value="examples"/>
@@ -63,26 +74,19 @@
 
     <target name="core.compile" depends="core.build.dir">
         <javac srcdir="${core.src.dir}" destdir="${core.build.dir}">
-            <classpath>
-                <fileset dir="${lib.dir}"/>
-            </classpath>
         </javac>
     </target>
 
     <target name="core.atest.compile" depends="core.compile">
         <javac srcdir="${core.atest.dir}" destdir="${core.build.dir}">
-            <classpath>
-                <fileset dir="${lib.dir}"/>
-            </classpath>
         </javac>
     </target>
 
     <target name="core.test.unit" depends="core.compile">
         <!-- Must add lib/junit.jar to the CLASSPATH to run this task -->
         <mkdir dir="${report.test.unit.dir}"/>
-        <junit printsummary="no" haltonfailure="true" haltonerror="true" fork="true">
+        <junit printsummary="on" haltonfailure="true" haltonerror="true" fork="true">
             <classpath>
-                <fileset dir="${lib.dir}"/>
                 <pathelement path="${core.build.dir}"/>
             </classpath>
             <formatter type="plain"/>
@@ -97,17 +101,17 @@
         <mkdir dir="${report.test.acceptance.dir}"/>
         <junit printsummary="no">
             <classpath>
-                <fileset dir="${lib.dir}"/>
                 <pathelement path="${core.build.dir}"/>
             </classpath>
             <formatter type="plain"/>
             <batchtest fork="no" todir="${report.test.acceptance.dir}">
-                <fileset dir="${core.atest.dir}" includes="atest/**/*Test.java" excludes="test/**/Abstract*"/>
+                 <fileset dir="${core.src.dir}" includes="test/**/*Test.java" excludes="test/**/Abstract*"/>
             </batchtest>
         </junit>
     </target>
-
-    <target name="core.jar" depends="core.test.unit">
+
+    <!-- skip unit tests -->
+    <target name="core.jar" depends="core.compile">
         <mkdir dir="${build.dist.bin.dir}"/>
         <jar basedir="${core.build.dir}" destfile="${core.jar}" excludes="test/**" index="true"/>
     </target>
@@ -121,7 +125,6 @@
     <target name="cglib.compile" depends="cglib.build.dir">
         <javac srcdir="${cglib.src.dir}" destdir="${cglib.build.dir}">
             <classpath>
-                <fileset dir="${lib.dir}"/>
                 <pathelement path="${core.build.dir}"/>
             </classpath>
         </javac>
@@ -130,7 +133,6 @@
     <target name="cglib.atest.compile" depends="cglib.compile">
         <javac srcdir="${cglib.atest.dir}" destdir="${cglib.build.dir}">
             <classpath>
-                <fileset dir="${lib.dir}"/>
                 <pathelement path="${core.build.dir}"/>
             </classpath>
         </javac>
@@ -141,7 +143,6 @@
         <mkdir dir="${report.test.unit.dir}"/>
         <junit printsummary="no" haltonfailure="true" haltonerror="true">
             <classpath>
-                <fileset dir="${lib.dir}"/>
                 <pathelement path="${core.build.dir}"/>
                 <pathelement path="${cglib.build.dir}"/>
             </classpath>
@@ -157,7 +158,6 @@
         <mkdir dir="${report.test.acceptance.dir}"/>
         <junit printsummary="no">
             <classpath>
-                <fileset dir="${lib.dir}"/>
                 <pathelement path="${core.build.dir}"/>
                 <pathelement path="${cglib.build.dir}"/>
             </classpath>
@@ -184,7 +184,6 @@
                 <include name="${core.dir}/**"/>
                 <include name="${extensions.dir}/**"/>
                 <include name="${examples.dir}/**"/>
-                <include name="${lib.dir}/**"/>
                 <include name="build.xml"/>
                 <include name="README.txt"/>
                 <include name="LICENSE.txt"/>
@@ -228,10 +227,6 @@
                 <path path="${cglib.src.dir}"/>
             </sourcepath>
 
-            <classpath>
-                <fileset dir="${lib.dir}"/>
-            </classpath>
-
             <group title="User API">
                 <package name="org.jmock"/>
                 <package name="org.jmock.builder"/>