diff --git a/src/tests/antunit/taskdefs/cvs/cvs.xml b/src/tests/antunit/taskdefs/cvs/cvs.xml
index c9b447308..b404c669c 100644
--- a/src/tests/antunit/taskdefs/cvs/cvs.xml
+++ b/src/tests/antunit/taskdefs/cvs/cvs.xml
@@ -29,4 +29,12 @@
     <cvsversion clientversionproperty="client" cvsroot="${cvsroot}"/>
     <au:assertPropertySet name="client"/>
   </target>
+
+  <target name="testBug38583">
+    <mkdir dir="${output}"/>
+    <cvs cvsroot="${cvsroot}" package="antmodule1" dest="${output}"/>
+    <cvschangelog dir="${output}/antmodule1"
+                  destfile="${output}/report.xml"/>
+    <au:assertFileExists file="${output}/report.xml"/>
+  </target>
 </project>
diff --git a/src/tests/antunit/taskdefs/cvs/repository/CVSROOT/history b/src/tests/antunit/taskdefs/cvs/repository/CVSROOT/history
index 321c9cedc..e8beac45f 100644
--- a/src/tests/antunit/taskdefs/cvs/repository/CVSROOT/history
+++ b/src/tests/antunit/taskdefs/cvs/repository/CVSROOT/history
@@ -1 +1,10 @@
 O48f739fd|stefan|~/ASF/ant/ant-HEAD/src/tests/antunit/taskdefs/cvs/*0|antmodule1||antmodule1
+O48f747b5|stefan|~/ASF/ant/ant-HEAD/src/tests/antunit/taskdefs/cvs/*0|antmodule1||antmodule1
+M48f747fb|stefan|~/ASF/ant/ant-HEAD/src/tests/antunit/taskdefs/cvs/*0|antmodule1|1.2|foo.txt
+M48f7480b|stefan|~/ASF/ant/ant-HEAD/src/tests/antunit/taskdefs/cvs/*0|antmodule1|1.3|foo.txt
+O48f748cb|stefan|/tmp/testoutput/*0|antmodule1||antmodule1
+O48f74940|stefan|/tmp/testoutput/*0|antmodule1||antmodule1
+O48f749a9|stefan|/tmp/testoutput/*0|antmodule1||antmodule1
+O48f74a02|stefan|/tmp/testoutput/*0|antmodule1||antmodule1
+M48f74a39|stefan|/tmp/testoutput/*0|antmodule1|1.4|foo.txt
+O48f74a62|stefan|/tmp/testoutput/*0|antmodule1||antmodule1
diff --git a/src/tests/antunit/taskdefs/cvs/repository/antmodule1/foo.txt,v b/src/tests/antunit/taskdefs/cvs/repository/antmodule1/foo.txt,v
index 55718c4ce..558cc2455 100644
--- a/src/tests/antunit/taskdefs/cvs/repository/antmodule1/foo.txt,v
+++ b/src/tests/antunit/taskdefs/cvs/repository/antmodule1/foo.txt,v
@@ -1,35 +1,85 @@
-head     1.1;
-branch   1.1.1;
-access   ;
-symbols  start:1.1.1.1 ant:1.1.1;
-locks    ; strict;
-comment  @# @;
+head	1.4;
+access;
+symbols
+	start:1.1.1.1 ant:1.1.1;
+locks; strict;
+comment	@# @;
 
 
+1.4
+date	2008.10.16.14.05.45;	author stefan;	state Exp;
+branches;
+next	1.3;
+commitid	761748f74a394567;
+
+1.3
+date	2008.10.16.13.56.27;	author stefan;	state Exp;
+branches;
+next	1.2;
+commitid	4dcd48f7480b4567;
+
+1.2
+date	2008.10.16.13.56.11;	author stefan;	state Exp;
+branches;
+next	1.1;
+commitid	4dae48f747fb4567;
+
 1.1
-date     2008.10.16.12.56.07;  author stefan;  state Exp;
-branches 1.1.1.1;
-next     ;
-commitid        17ca48f739e74567;
+date	2008.10.16.12.56.07;	author stefan;	state Exp;
+branches
+	1.1.1.1;
+next	;
+commitid	17ca48f739e74567;
 
 1.1.1.1
-date     2008.10.16.12.56.07;  author stefan;  state Exp;
-branches ;
-next     ;
-commitid        17ca48f739e74567;
+date	2008.10.16.12.56.07;	author stefan;	state Exp;
+branches;
+next	;
+commitid	17ca48f739e74567;
 
 
 desc
 @@
 
 
+1.4
+log
+@----------------------------
+@
+text
+@This is a text.
+Added a line.
+and one more line.
+@
+
+
+1.3
+log
+@typo
+@
+text
+@d3 1
+@
+
+
+1.2
+log
+@--------------------
+@
+text
+@d2 1
+a2 1
+added a line.
+@
+
 
 1.1
 log
 @Initial revision
 @
 text
-@This is a text.
+@d2 1
+a2 1
 
 @