diff --git a/faq/plugin.jelly b/faq/plugin.jelly
index efba5a01..60734148 100644
--- a/faq/plugin.jelly
+++ b/faq/plugin.jelly
@@ -8,19 +8,15 @@
   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>
+    <doc:registerReport
+      name="FAQs"
+      pluginName="faq"
+      description="Frequently Asked Questions."
+      link="faq"/>
   </goal>
 
   <goal name="maven-faq-plugin:deregister">
-    <j:if test="${sourcesPresent}">
-      <doc:deregisterReport name="FAQs"/>
-    </j:if>
+    <doc:deregisterReport name="FAQs"/>
   </goal>
 
   <goal name="faq:report" 
@@ -28,6 +24,9 @@
       <attainGoal name="faq"/>
   </goal>
 
+  <!--
+   | @TODO: Make this a tag and transform multiple *.fml files
+   -->
   <goal name="faq"
     description="Generates an FAQ xdoc file from an FAQ XML document">
 
@@ -44,11 +43,11 @@
     </j:if>
     
     <util:file var="srcfileFile" name="${srcfile}"/>
-    <j:set var="srcfile" value="${srcfileFile.getCanonicalPath()}"/>
+    <j:set var="srcfile" value="${srcfileFile.canonicalPath}"/>
     <util:file var="destfileFile" name="${destfile}"/>
-    <j:set var="destfile" value="${destfileFile.getCanonicalPath()}"/>
+    <j:set var="destfile" value="${destfileFile.canonicalPath}"/>
         
-    <j:set var="outputencoding" value="${maven.docs.outputencoding}"/>
+    <j:set var="outputencoding" value="${pom.getPluginContext('maven-xdoc-plugin').getVariable('maven.docs.outputencoding')}"/>
 
     <x:parse var="doc" xml="${srcfileFile}"/>    
     <x:set var="root" select="$doc/*"/>
diff --git a/faq/project.xml b/faq/project.xml
index 3b69f9a6..eba0fc8f 100644
--- a/faq/project.xml
+++ b/faq/project.xml
@@ -27,6 +27,16 @@
         <role>Java Developer</role>
       </roles>
     </developer>
+
+    <developer>
+      <name>dIon Gillard</name>
+      <id>dion</id>
+      <email>dion@apache.org</email>
+      <organization>Apache Software Foundation</organization>
+      <roles>
+        <role>Developer</role>
+      </roles>
+    </developer>
   </developers>
   <dependencies>
     <dependency>
@@ -56,4 +66,21 @@
       <url>http://xml.apache.org/xerces2-j/</url>
     </dependency>
   </dependencies>
+  
+  <reports>
+    <report>maven-changelog-plugin</report>
+    <report>maven-changes-plugin</report>
+    <!--<report>maven-checkstyle-plugin</report>-->
+    <report>maven-developer-activity-plugin</report>
+    <report>maven-file-activity-plugin</report>
+    <!--<report>maven-javadoc-plugin</report>-->
+    <!--<report>maven-jdepend-plugin</report>-->
+    <!--<report>maven-junit-report-plugin</report>-->
+    <!--<report>maven-jxr-plugin</report>-->
+    <report>maven-license-plugin</report>
+    <report>maven-linkcheck-plugin</report>
+    <!--<report>maven-pmd-plugin</report>-->
+    <report>maven-tasklist-plugin</report>
+    <report>maven-faq-plugin</report>
+  </reports>
 </project>