diff --git a/WHATSNEW b/WHATSNEW
index 59876e508..6c806aed7 100644
--- a/WHATSNEW
+++ b/WHATSNEW
@@ -149,6 +149,11 @@ Fixed bugs:
 * <cvstagdiff> had a problem with "dd-MM-yy hh:mm:ss" formats
   Bugzilla Report 15995.
 
+* <cvstagdiff> cvsroot and package attributes added to the root
+  element tagdiff of the xml output
+  Bugzilla Report 16081.
+
+
 Other changes:
 --------------
 * Six new Clearcase tasks added.
diff --git a/docs/manual/CoreTasks/cvstagdiff.html b/docs/manual/CoreTasks/cvstagdiff.html
index d4d595c32..1d7f5021b 100644
--- a/docs/manual/CoreTasks/cvstagdiff.html
+++ b/docs/manual/CoreTasks/cvstagdiff.html
@@ -161,9 +161,13 @@ how to generate a HTML report from the XML report.</p>
 </pre>
 
 <h4>Sample Output</h4>
+<p>
+The cvsroot and package attributes of the tagdiff element are new in ant 1.6.
+</p>
 <pre>
 &lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;
-&lt;tagdiff startTag=&quot;ANT_14&quot; endTag=&quot;ANT_141&quot;&gt;
+&lt;tagdiff startTag=&quot;ANT_14&quot; endTag=&quot;ANT_141&quot; 
+cvsroot=&quot;:pserver:anoncvs@cvs.apache.org:/home/cvspublic&quot; package=&quot;ant&quot;&gt;
   &lt;entry&gt;
     &lt;file&gt;
       &lt;name&gt;src/main/org/apache/tools/ant/DirectoryScanner.java&lt;/name&gt;
diff --git a/src/main/org/apache/tools/ant/taskdefs/cvslib/CvsTagDiff.java b/src/main/org/apache/tools/ant/taskdefs/cvslib/CvsTagDiff.java
index e712c0f70..63ff3a7a9 100644
--- a/src/main/org/apache/tools/ant/taskdefs/cvslib/CvsTagDiff.java
+++ b/src/main/org/apache/tools/ant/taskdefs/cvslib/CvsTagDiff.java
@@ -1,7 +1,7 @@
 /*
  * The Apache Software License, Version 1.1
  *
- * Copyright (c) 2002 The Apache Software Foundation.  All rights
+ * Copyright (c) 2002-2003 The Apache Software Foundation.  All rights
  * reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -351,6 +351,10 @@ public class CvsTagDiff extends AbstractCvsTask {
             } else {
                 writer.print("endDate=\"" + m_endDate + "\" ");
             }
+
+            writer.print("cvsroot=\"" + getCvsRoot() + "\" ");
+            writer.print("package=\"" + m_package + "\" ");
+
             writer.println(">");
             for (int i = 0, c = entries.length; i < c; i++) {
                 writeTagEntry(writer, entries[i]);