diff --git a/faq/plugin.jelly b/faq/plugin.jelly
index ba2c5f89..e5eeaacd 100644
--- a/faq/plugin.jelly
+++ b/faq/plugin.jelly
@@ -1,10 +1,32 @@
 <?xml version="1.0"?>
 
 <project
-  xmlns:ant="jelly:ant"
   xmlns:j="jelly:core"
   xmlns:util="jelly:util"
-  xmlns:x="jelly:xml">
+  xmlns:x="jelly:xml"
+  xmlns:ant="jelly:ant"
+  xmlns:doc="doc">
+
+  <goal name="maven-faq-plugin:register">
+    <j:if test="${sourcesPresent}">
+      <doc:registerReport 
+        name="FAQs"
+        pluginName="faq"
+		description="Frequently Asked Questions."
+        link="faq"/>
+    </j:if>
+  </goal>
+
+  <goal name="maven-faq-plugin:deregister">
+    <j:if test="${sourcesPresent}">
+		<doc:deregisterReport name="FAQs"/>
+    </j:if>
+  </goal>
+
+  <goal name="faq:report" 
+    description="Generate FAQs">
+      <attainGoal name="faq"/>
+  </goal>
 
   <goal name="faq"
     description="Generates an FAQ xdoc file from an FAQ XML document">