diff --git a/proposal/myrmidon/build.xml b/proposal/myrmidon/build.xml
index c6747a2dd..e5483c58b 100644
--- a/proposal/myrmidon/build.xml
+++ b/proposal/myrmidon/build.xml
@@ -114,22 +114,30 @@ Legal:
       <exclude name="org/apache/ant/**" />
 
       <zipfileset dir="${manifest.dir}" fullpath="META-INF/ant-roles.xml">
-        <include name="base-ant-roles.xml"/>
+        <include name="builtin-ant-roles.xml"/>
       </zipfileset>
 
       <zipfileset dir="${manifest.dir}" fullpath="META-INF/ant-descriptor.xml">
-        <include name="base-ant-descriptor.xml"/>
+        <include name="builtin-ant-descriptor.xml"/>
       </zipfileset>
 
     </jar>
 
     <jar jarfile="${build.lib}/core.atl" basedir="${build.classes}">
       <include name="org/apache/ant/modules/**" />
+      <include name="org/apache/myrmidon/libs/core/**" />
       <zipfileset dir="${manifest.dir}" fullpath="META-INF/ant-descriptor.xml">
         <include name="core-ant-descriptor.xml"/>
       </zipfileset>
     </jar>
 
+    <jar jarfile="${build.lib}/selftest.atl" basedir="${build.classes}">
+      <include name="org/apache/myrmidon/libs/selftest/**" />
+      <zipfileset dir="${manifest.dir}" fullpath="META-INF/ant-descriptor.xml">
+        <include name="selftest-ant-descriptor.xml"/>
+      </zipfileset>
+    </jar>
+
     <jar jarfile="${build.lib}/runtime.atl" basedir="${build.classes}">
       <include name="org/apache/myrmidon/libs/runtime/**"/>
       <zipfileset dir="${manifest.dir}" fullpath="META-INF/ant-descriptor.xml">
@@ -137,6 +145,13 @@ Legal:
       </zipfileset>
     </jar>
 
+    <jar jarfile="${build.lib}/ant1.atl" basedir="${build.classes}">
+      <include name="org/apache/myrmidon/libs/ant1/**"/>
+      <zipfileset dir="${manifest.dir}" fullpath="META-INF/ant-descriptor.xml">
+        <include name="ant1-ant-descriptor.xml"/>
+      </zipfileset>
+    </jar>
+
   </target>
 
   <!-- Creates the distribution -->
@@ -145,6 +160,8 @@ Legal:
     <mkdir dir="${dist.bin}"/>
     <mkdir dir="${dist.lib}"/>
 
+    <copy file="tools/lib/ant.jar" tofile="${dist.lib}/ant1-compat.jar" />
+
     <copy todir="${dist.lib}">
       <fileset dir="${build.lib}"/>
     </copy>