diff --git a/proposal/myrmidon/src/java/org/apache/antlib/cvslib/Cvs.java b/proposal/myrmidon/src/java/org/apache/antlib/cvslib/Cvs.java
index d824981be..2ddbcb8cf 100644
--- a/proposal/myrmidon/src/java/org/apache/antlib/cvslib/Cvs.java
+++ b/proposal/myrmidon/src/java/org/apache/antlib/cvslib/Cvs.java
@@ -14,6 +14,7 @@ import org.apache.myrmidon.api.TaskException;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.taskdefs.exec.Execute;
 import org.apache.tools.ant.taskdefs.exec.LogStreamHandler;
+import org.apache.tools.ant.taskdefs.exec.LogOutputStream;
 import org.apache.tools.ant.types.Commandline;
 import org.apache.tools.ant.types.EnvironmentData;
 import org.apache.tools.ant.types.EnvironmentVariable;
@@ -147,11 +148,9 @@ public class Cvs
         final Commandline command = buildCommandline();
         final EnvironmentData env = buildEnvironment();
 
-        //FIXME:
-        final LogStreamHandler streamhandler =
-            new LogStreamHandler( null, Project.MSG_INFO, Project.MSG_WARN );
-
-        final Execute exe = new Execute( streamhandler, null );
+        final Execute exe = new Execute();
+        exe.setOutput( new LogOutputStream( null, Project.MSG_INFO ) );
+        exe.setError( new LogOutputStream( null, Project.MSG_WARN ) );
         if( m_dest == null ) m_dest = getBaseDirectory();
         exe.setWorkingDirectory( m_dest );
 
diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/framework/exec/Environment.java b/proposal/myrmidon/src/java/org/apache/myrmidon/framework/exec/Environment.java
index 1ba1586d9..ee6469b28 100644
--- a/proposal/myrmidon/src/java/org/apache/myrmidon/framework/exec/Environment.java
+++ b/proposal/myrmidon/src/java/org/apache/myrmidon/framework/exec/Environment.java
@@ -15,10 +15,9 @@ import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.Locale;
 import java.util.Properties;
-import org.apache.myrmidon.framework.Os;
 import org.apache.myrmidon.api.TaskException;
+import org.apache.myrmidon.framework.Os;
 import org.apache.tools.ant.taskdefs.exec.Execute;
-import org.apache.tools.ant.taskdefs.exec.PumpStreamHandler;
 
 /**
  * This is the class that can be used to retrieve the environment
@@ -224,7 +223,10 @@ public final class Environment
         throws IOException, ExecException
     {
         final ByteArrayOutputStream output = new ByteArrayOutputStream();
-        final Execute exe = new Execute( new PumpStreamHandler( output ) );
+        final Execute exe = new Execute();
+        exe.setOutput( output );
+        exe.setError( output );
+
         exe.setCommandline( getEnvCommand() );
 
         // Make sure we do not recurse forever