diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 79316535c..968f1e839 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -198,6 +198,7 @@ Paul King
 Paulo Gaspar
 Peter B. West
 Peter Donald
+Peter Doornbosch
 Peter Hulst
 Peter Reilly
 Phillip Wells
diff --git a/WHATSNEW b/WHATSNEW
index ea14d13f1..190329a0d 100644
--- a/WHATSNEW
+++ b/WHATSNEW
@@ -48,6 +48,9 @@ Other changes:
 * <javadoc> useexternalfile now applies to all command line arguments
   of javadoc. Bugzilla report 40852.
 
+* javadoc/tag@description is now set to the name if description is
+  not specified. Bugzill report 32927.
+
 
 Changes from Ant 1.7.0Beta2 to Ant 1.7.0Beta3
 =============================================
diff --git a/contributors.xml b/contributors.xml
index d2a0a38b6..931c02838 100644
--- a/contributors.xml
+++ b/contributors.xml
@@ -791,6 +791,10 @@
     <first>Peter</first>
     <last>Donald</last>
   </name>
+  <name>
+    <first>Peter</first>
+    <last>Doornbosch</last>
+  </name>
   <name>
     <first>Peter</first>
     <last>Hulst</last>
diff --git a/src/main/org/apache/tools/ant/taskdefs/Javadoc.java b/src/main/org/apache/tools/ant/taskdefs/Javadoc.java
index 87dd44f80..253247c73 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Javadoc.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Javadoc.java
@@ -1387,7 +1387,8 @@ public class Javadoc extends Task {
                 return name + ":" + (enabled ? "" : "X")
                     + scope + ":" + getDescription();
             } else {
-                return name;
+                return name + ":" + (enabled ? "" : "X")
+                    + scope + ":" + name;
             }
         }
     }