diff --git a/xdoc/src/plugin-resources/templates/downloads.jelly b/xdoc/src/plugin-resources/templates/downloads.jelly
index f7896436..6d5709d9 100644
--- a/xdoc/src/plugin-resources/templates/downloads.jelly
+++ b/xdoc/src/plugin-resources/templates/downloads.jelly
@@ -72,6 +72,13 @@
                       <th>Release notes</th>
                     </j:if>
                   </tr>
+
+                  <!-- Call the Announcement plugin to generate release notes if the changes.xml
+                       file exists -->
+                  <j:if test="${changesAsFile.exists()}">
+                    <attainGoal name="announcement:generate-all"/>
+                  </j:if>
+
                   <j:forEach var="version" items="${pom.versions}">
                     <!-- Exclude the version being worked on (i.e. the one 
                          that has a HEAD tag -->
@@ -82,8 +89,6 @@
                         </td>
                         <j:if test="${changesAsFile.exists()}">
                           <td>
-                            <!-- Call the Announcement plugin to generate release notes -->
-                            <attainGoal name="announcement:generate-all"/>
                             <a href="announcements/announcement-${version}.txt">${version} release notes</a>
                           </td>
                         </j:if>