diff --git a/announcement/plugin.properties b/announcement/plugin.properties
index 1b9e6364..7ba58565 100644
--- a/announcement/plugin.properties
+++ b/announcement/plugin.properties
@@ -33,3 +33,4 @@ maven.announcement.file=${maven.build.dir}/announcement.txt
 # If not defined, it defaults to "${maven.repo.remote}/${pom.groupId}/plugins"
 # For example:
 # maven.announcement.distributionUrl = http//www.mysite.com/dist
+
diff --git a/announcement/project.xml b/announcement/project.xml
index 7ad377af..280d5807 100644
--- a/announcement/project.xml
+++ b/announcement/project.xml
@@ -61,6 +61,15 @@
         <role>Java Developer</role>
       </roles>
     </developer>
+    <developer>
+      <name>Brett Porter</name>
+      <id>brett</id>
+      <email>brett@apache.org</email>
+      <organization>f2 network</organization>
+      <roles>
+        <role>Java Developer</role>
+      </roles>
+    </developer>
   </developers>
   <contributors>
     <contributor>
diff --git a/announcement/src/plugin-resources/announcement.jsl b/announcement/src/plugin-resources/announcement.jsl
index 29651d9c..fb9c15c5 100644
--- a/announcement/src/plugin-resources/announcement.jsl
+++ b/announcement/src/plugin-resources/announcement.jsl
@@ -25,6 +25,7 @@
     xmlns:j="jelly:core"
     xmlns:jsl="jelly:jsl"
     xmlns:x="jelly:xml"
+    xmlns:u="jelly:util"
     xmlns:maven="jelly:maven"
     xmlns="dummy" trim="true">
 
@@ -98,7 +99,9 @@ Changes in this version include:</j:whitespace>
         </j:forEach>
       </j:if>
 
-      <j:whitespace trim="false"> 
+      <!-- Nasty hack to detect a plugin until pom.type exists -->
+      <u:available file="${basedir}/plugin.jelly">
+        <j:whitespace trim="false"> 
 
 To automatically install the plugin, type the following on a single line:
 
@@ -107,43 +110,45 @@ maven plugin:download
   -DartifactId=${pom.artifactId}
   -Dversion=${versionVariable}
 
-For a manual installation, you can download the ${pom.name} 
-here:
-
+For a manual installation, you can download the plugin here:
 ${distributionUrl}/${pom.artifactId}-${versionVariable}.jar
+        </j:whitespace>
+      </u:available>
+      <j:whitespace trim="false"> 
 
 Have fun!
--The development team
+-The ${pom.groupId} team
       </j:whitespace>
-
     </j:if>
 
   </jsl:template>
   
   <jsl:template match="action" trim="true">
-        <x:set var="body" select="string(.)"/>
-        <j:set var="counter" value=""/>
+    <x:set var="body" select="string(.)"/>
+    <j:set var="counter" value=""/>
         
-        <j:set var="issue"><x:expr select="@issue"/></j:set>
-        <j:set var="dueto"><x:expr select="@due-to"/></j:set>
+    <j:set var="issue"><x:expr select="@issue"/></j:set>
+    <j:set var="dueto"><x:expr select="@due-to"/></j:set>
         
-        <j:set var="text" trim="true">
-          ${body}<j:if test="${issue != ''}"> Fixes ${issue}.</j:if> <j:if test="${dueto != ''}"><j:whitespace> Thanks to ${dueto}.</j:whitespace></j:if>
-        </j:set>
+    <j:set var="text" trim="true">
+      ${body}
+      <j:if test="${issue != ''}"><j:whitespace> Issue: ${issue}.</j:whitespace></j:if>
+      <j:if test="${dueto != ''}"><j:whitespace> Thanks to ${dueto}.</j:whitespace></j:if>
+    </j:set>
         
-        <j:forEach var="line" items="${formatter.format(text,75)}">
-          <j:choose>
-            <j:when test="${counter.length() == '0'}">
-              <j:whitespace trim="false">
+    <j:forEach var="line" items="${formatter.format(text,75)}">
+      <j:choose>
+        <j:when test="${counter.length() == '0'}">
+          <j:whitespace trim="false">
 o ${line}</j:whitespace>
-            </j:when>
-            <j:otherwise>
-              <j:whitespace trim="false">
+        </j:when>
+        <j:otherwise>
+          <j:whitespace trim="false">
   ${line}</j:whitespace>
-            </j:otherwise>
-          </j:choose>
-          <j:set var="counter" value="${counter}X"/>
-        </j:forEach>
+        </j:otherwise>
+      </j:choose>
+      <j:set var="counter" value="${counter}X"/>
+    </j:forEach>
   </jsl:template>
 
   <jsl:template match="@*"/>
diff --git a/announcement/xdocs/changes.xml b/announcement/xdocs/changes.xml
index f24b342a..c378039b 100644
--- a/announcement/xdocs/changes.xml
+++ b/announcement/xdocs/changes.xml
@@ -25,6 +25,10 @@
   </properties>
   <body>
     <release version="1.1-SNAPSHOT" date="in CVS">
+      <action dev="brett" type="update">
+        Detect whether the project is a plugin or not by the existence of plugin.jelly
+        in the project directory, and change the wording accordingly.
+      </action>
       <action dev="vmassol" type="add">
         Added new <code>maven.announcement.distributionUrl</code> property
         which specifies where the project jars can be downloaded from. If
@@ -41,7 +45,7 @@
         Improved web site documentation.
       </action>
       <action dev="vmassol" type="fix">
-        Add a space after the "." of the "Fixes xxx." (which happens when
+        Add a space after the "." of the "Issue: xxx." (which happens when
         you use the "issue" attribute in changes.xml).
       </action>
       <action dev="vmassol" type="add">