diff --git a/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/PluginHelpGenerator.java b/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/PluginHelpGenerator.java
index 1299cf8..714fc1b 100644
--- a/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/PluginHelpGenerator.java
+++ b/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/PluginHelpGenerator.java
@@ -155,7 +155,7 @@ public class PluginHelpGenerator
         try
         {
             writer = new OutputStreamWriter( new FileOutputStream( helpClass ), request.getEncoding() );
-            writer.write( getHelpClassSources( propertiesFilePath ) );
+            writer.write( getHelpClassSources( propertiesFilePath, pluginDescriptor ) );
             writer.flush();
         }
         catch ( IOException e )
@@ -189,7 +189,7 @@ public class PluginHelpGenerator
     // Private methods
     // ----------------------------------------------------------------------
 
-    protected String getHelpClassSources( String propertiesFilePath )
+    protected String getHelpClassSources( String propertiesFilePath, PluginDescriptor pluginDescriptor )
     {
         Properties properties = new Properties();
         VelocityContext context = new VelocityContext( properties );
@@ -202,6 +202,9 @@ public class PluginHelpGenerator
             properties.put( "helpPackageName", "" );
         }
         properties.put( "pluginHelpPath", propertiesFilePath + "/plugin-help.xml" );
+        properties.put( "artifactId", pluginDescriptor.getArtifactId());
+        properties.put( "goalPrefix", pluginDescriptor.getGoalPrefix());
+
         // FIXME encoding !
 
         StringWriter stringWriter = new StringWriter();
diff --git a/maven-plugin-tools-generators/src/main/resources/help-class-source.vm b/maven-plugin-tools-generators/src/main/resources/help-class-source.vm
index 424e8e2..3513540 100644
--- a/maven-plugin-tools-generators/src/main/resources/help-class-source.vm
+++ b/maven-plugin-tools-generators/src/main/resources/help-class-source.vm
@@ -17,8 +17,8 @@ import java.util.Iterator;
 import java.util.List;
 
 /**
- * Display help information on maven-plugin-plugin.<br/>
- * Call <code>mvn plugin:help -Ddetail=true -Dgoal=&lt;goal-name&gt;</code> to display parameter details.
+ * Display help information on ${artifactId}.<br/>
+ * Call <code>mvn ${goalPrefix}:help -Ddetail=true -Dgoal=&lt;goal-name&gt;</code> to display parameter details.
  * @author
  * @version
  * @goal help