diff --git a/proposal/myrmidon/lib/excalibur-bzip2-1.0a.jar b/proposal/myrmidon/lib/excalibur-bzip2-1.0a.jar
index d6ab05526..bdf8776cf 100644
Binary files a/proposal/myrmidon/lib/excalibur-bzip2-1.0a.jar and b/proposal/myrmidon/lib/excalibur-bzip2-1.0a.jar differ
diff --git a/proposal/myrmidon/lib/excalibur-tar-1.0.jar b/proposal/myrmidon/lib/excalibur-tar-1.0a.jar
similarity index 70%
rename from proposal/myrmidon/lib/excalibur-tar-1.0.jar
rename to proposal/myrmidon/lib/excalibur-tar-1.0a.jar
index 85fdb8fe5..c4a0bd557 100644
Binary files a/proposal/myrmidon/lib/excalibur-tar-1.0.jar and b/proposal/myrmidon/lib/excalibur-tar-1.0a.jar differ
diff --git a/proposal/myrmidon/lib/excalibur-zip-1.0.jar b/proposal/myrmidon/lib/excalibur-zip-1.0.jar
deleted file mode 100644
index 1e111a6ac..000000000
Binary files a/proposal/myrmidon/lib/excalibur-zip-1.0.jar and /dev/null differ
diff --git a/proposal/myrmidon/lib/excalibur-zip-1.0a.jar b/proposal/myrmidon/lib/excalibur-zip-1.0a.jar
new file mode 100644
index 000000000..34dac38f9
Binary files /dev/null and b/proposal/myrmidon/lib/excalibur-zip-1.0a.jar differ
diff --git a/proposal/myrmidon/src/java/org/apache/antlib/archive/BUnzip2.java b/proposal/myrmidon/src/java/org/apache/antlib/archive/BUnzip2.java
index 3d1a76924..b3de6b3eb 100644
--- a/proposal/myrmidon/src/java/org/apache/antlib/archive/BUnzip2.java
+++ b/proposal/myrmidon/src/java/org/apache/antlib/archive/BUnzip2.java
@@ -10,7 +10,7 @@ package org.apache.antlib.archive;
 import java.io.IOException;
 import java.io.InputStream;
 import org.apache.myrmidon.api.TaskException;
-import org.apache.avalon.excalibur.bzip2.CBZip2InputStream;
+import org.apache.excalibur.bzip2.CBZip2InputStream;
 
 /**
  * Expands a file that has been compressed with the BZIP2 algorithm. Normally
diff --git a/proposal/myrmidon/src/java/org/apache/antlib/archive/BZip2.java b/proposal/myrmidon/src/java/org/apache/antlib/archive/BZip2.java
index d943490d2..a4ec4d241 100644
--- a/proposal/myrmidon/src/java/org/apache/antlib/archive/BZip2.java
+++ b/proposal/myrmidon/src/java/org/apache/antlib/archive/BZip2.java
@@ -9,7 +9,7 @@ package org.apache.antlib.archive;
 
 import java.io.IOException;
 import java.io.OutputStream;
-import org.apache.avalon.excalibur.bzip2.CBZip2OutputStream;
+import org.apache.excalibur.bzip2.CBZip2OutputStream;
 import org.apache.myrmidon.api.TaskException;
 
 /**
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/archive/Ear.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/archive/Ear.java
index d754357a9..bda13d110 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/archive/Ear.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/archive/Ear.java
@@ -9,7 +9,7 @@ package org.apache.tools.todo.taskdefs.archive;
 
 import java.io.File;
 import java.io.IOException;
-import org.apache.avalon.excalibur.zip.ZipOutputStream;
+import org.apache.excalibur.zip.ZipOutputStream;
 import org.apache.myrmidon.api.TaskException;
 
 /**
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/archive/Jar.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/archive/Jar.java
index 1c8721076..666a236f6 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/archive/Jar.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/archive/Jar.java
@@ -24,7 +24,7 @@ import org.apache.tools.todo.taskdefs.manifest.Manifest;
 import org.apache.tools.todo.taskdefs.manifest.ManifestException;
 import org.apache.tools.todo.taskdefs.manifest.ManifestUtil;
 import org.apache.tools.todo.types.FileScanner;
-import org.apache.avalon.excalibur.zip.ZipOutputStream;
+import org.apache.excalibur.zip.ZipOutputStream;
 
 /**
  * Creates a JAR archive.
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/archive/Tar.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/archive/Tar.java
index f13288525..07a216007 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/archive/Tar.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/archive/Tar.java
@@ -14,8 +14,8 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Iterator;
 import org.apache.avalon.excalibur.io.IOUtil;
-import org.apache.avalon.excalibur.tar.TarEntry;
-import org.apache.avalon.excalibur.tar.TarOutputStream;
+import org.apache.excalibur.tar.TarEntry;
+import org.apache.excalibur.tar.TarOutputStream;
 import org.apache.myrmidon.api.TaskException;
 import org.apache.tools.todo.taskdefs.MatchingTask;
 import org.apache.tools.todo.types.ScannerUtil;
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/archive/Untar.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/archive/Untar.java
index 530e79348..fe58b655e 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/archive/Untar.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/archive/Untar.java
@@ -11,8 +11,8 @@ import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
 import org.apache.avalon.excalibur.io.IOUtil;
-import org.apache.avalon.excalibur.tar.TarEntry;
-import org.apache.avalon.excalibur.tar.TarInputStream;
+import org.apache.excalibur.tar.TarEntry;
+import org.apache.excalibur.tar.TarInputStream;
 import org.apache.myrmidon.api.TaskException;
 
 /**
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/archive/War.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/archive/War.java
index 82ea159bc..b11a8ec21 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/archive/War.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/archive/War.java
@@ -10,7 +10,7 @@ package org.apache.tools.todo.taskdefs.archive;
 import java.io.File;
 import java.io.IOException;
 import org.apache.myrmidon.api.TaskException;
-import org.apache.avalon.excalibur.zip.ZipOutputStream;
+import org.apache.excalibur.zip.ZipOutputStream;
 
 /**
  * Creates a WAR archive.
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/archive/Zip.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/archive/Zip.java
index cb0fc310a..2b1d444d2 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/archive/Zip.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/archive/Zip.java
@@ -21,8 +21,8 @@ import java.util.Stack;
 import java.util.zip.CRC32;
 import java.util.zip.ZipInputStream;
 import org.apache.avalon.excalibur.io.IOUtil;
-import org.apache.avalon.excalibur.zip.ZipEntry;
-import org.apache.avalon.excalibur.zip.ZipOutputStream;
+import org.apache.excalibur.zip.ZipEntry;
+import org.apache.excalibur.zip.ZipOutputStream;
 import org.apache.myrmidon.api.TaskException;
 import org.apache.tools.todo.taskdefs.MatchingTask;
 import org.apache.tools.todo.types.DirectoryScanner;