diff --git a/src/etc/testcases/taskdefs/abstractcvstask.xml b/src/etc/testcases/taskdefs/abstractcvstask.xml
index 197e07aee..9a7da3fe9 100644
--- a/src/etc/testcases/taskdefs/abstractcvstask.xml
+++ b/src/etc/testcases/taskdefs/abstractcvstask.xml
@@ -31,6 +31,19 @@
          quiet="true" />
   </target>
 
+  <target name="tag-attribute">
+    <mkdir dir="tmpdir" />
+    <cvs cvsroot=":pserver:anoncvs@cvs.apache.org:/home/cvspublic"
+         package="jakarta-ant/build.xml"
+         dest="tmpdir"
+         quiet="true"
+         tag="ANT_141" />
+    <cvs cvsroot=":pserver:anoncvs@cvs.apache.org:/home/cvspublic"
+         package="jakarta-ant/build.xml"
+         dest="tmpdir"
+         command="status"/>
+  </target>
+
   <target name="cleanup">
     <delete dir="tmpdir" />
   </target>
diff --git a/src/main/org/apache/tools/ant/taskdefs/AbstractCvsTask.java b/src/main/org/apache/tools/ant/taskdefs/AbstractCvsTask.java
index c9d240999..b8a2443a5 100644
--- a/src/main/org/apache/tools/ant/taskdefs/AbstractCvsTask.java
+++ b/src/main/org/apache/tools/ant/taskdefs/AbstractCvsTask.java
@@ -377,7 +377,7 @@ public abstract class AbstractCvsTask extends Task {
 
         String c = this.getCommand();
         if( c != null ) {
-            this.cmd.createArgument().setLine(c);
+            this.cmd.createArgument(true).setLine(c);
             this.addConfiguredCommandline( this.cmd, true );
         }
 
diff --git a/src/testcases/org/apache/tools/ant/BuildFileTest.java b/src/testcases/org/apache/tools/ant/BuildFileTest.java
index d0694a3f3..4fc1d081b 100644
--- a/src/testcases/org/apache/tools/ant/BuildFileTest.java
+++ b/src/testcases/org/apache/tools/ant/BuildFileTest.java
@@ -115,7 +115,8 @@ public abstract class BuildFileTest extends TestCase {
     protected void expectLogContaining(String target, String log) { 
         executeTarget(target);
         String realLog = getLog();
-        assertTrue("expecting log to contain \""+log+"\"", 
+        assertTrue("expecting log to contain \""+log+"\" log was \""
+                   + realLog + "\"", 
                    realLog.indexOf(log) >= 0);
     }
 
diff --git a/src/testcases/org/apache/tools/ant/taskdefs/AbstractCvsTaskTest.java b/src/testcases/org/apache/tools/ant/taskdefs/AbstractCvsTaskTest.java
index d7ce7b57a..3156d542f 100644
--- a/src/testcases/org/apache/tools/ant/taskdefs/AbstractCvsTaskTest.java
+++ b/src/testcases/org/apache/tools/ant/taskdefs/AbstractCvsTaskTest.java
@@ -90,4 +90,11 @@ public class AbstractCvsTaskTest extends BuildFileTest {
         expectLogContaining("package-attribute", "U jakarta-ant/build.xml");
         assertTrue("now it is there", f.exists());
     }
+
+    public void testTagAttribute() {
+        File f = getProject().resolveFile("tmpdir/jakarta-ant/build.xml");
+        assertTrue("starting empty", !f.exists());
+        expectLogContaining("tag-attribute", "ANT_141 (revision: 1.175.2.13)");
+        assertTrue("now it is there", f.exists());
+    }
 }