diff --git a/pmd/pom.xml b/pmd/pom.xml
index 3c60810fc4..a5ea17635a 100644
--- a/pmd/pom.xml
+++ b/pmd/pom.xml
@@ -250,6 +250,72 @@
           <target>1.5</target>
         </configuration>
       </plugin>
+
+	<plugin>
+      	<groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-antrun-plugin</artifactId>
+        <inherited>true</inherited>
+        <executions>
+        	<execution>
+        		<id>generate-ruleset-as-xdocs</id>
+            	<phase>pre-site</phase>
+                <configuration>
+                <tasks>
+                	<echo>PMD specific tasks: generating xdocs</echo>
+                    <ant antfile="tool/ant/generate-pmd-xdoc.xml">
+                    	<property name="target" value="xdocs/rules"/>
+                    	<property name="lib" value="${basedir}/tool/lib"/>
+                 	</ant>
+                </tasks>
+              	</configuration>
+                <goals>
+                	<goal>run</goal>
+                </goals>
+			</execution>
+
+			<execution>
+        		<id>move-index-and-delete-generated-xdocs</id>
+            	<phase>post-site</phase>
+                <configuration>
+                <tasks>
+                	<echo>PMD specific tasks: cleaning generated xdocs</echo>
+	 				<move 	file="${project.build.directory}/site/rules/index.html"
+	 						tofile="${project.build.directory}/site/index.html"/>
+					<delete>
+						<fileset 	dir="xdocs/rules"
+									includes="**/*.xml"/>
+						<fileset 	dir="xdocs"
+									includes="mergedrules.xml"/>
+					</delete>
+                </tasks>
+              	</configuration>
+                <goals>
+                	<goal>run</goal>
+                </goals>
+			</execution>
+
+			<execution>
+        		<id>pmd-clean</id>
+            	<phase>clean</phase>
+                <configuration>
+                <tasks>
+                	<echo>PMD specific tasks: cleaning generated xdocs</echo>
+					<delete>
+						<fileset 	dir="xdocs/rules"
+									includes="**/*.xml"/>
+					</delete>
+                </tasks>
+              	</configuration>
+                <goals>
+                	<goal>run</goal>
+                </goals>
+			</execution>
+
+
+    	</executions>
+	</plugin>
+
+
     </plugins>
   </build>
   <dependencies>
@@ -299,8 +365,8 @@
         	<groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-javadoc-plugin</artifactId>
         </plugin>  -->
+
 		<plugin>
-		
 	        <groupId>org.apache.maven.plugins</groupId>
     	    <artifactId>maven-pmd-plugin</artifactId>
         	<configuration>
@@ -318,7 +384,7 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-checkstyle-plugin</artifactId>
         <configuration>
-          <configLocation>etc/checkstyle-config.xml</configLocation>
+          <configLocation>tool/config/checkstyle-config.xml</configLocation>
         </configuration>
       </plugin>
     </plugins>
diff --git a/pmd/tool/config/checkstyle-config.xml b/pmd/tool/config/checkstyle-config.xml
new file mode 100644
index 0000000000..b7d585358a
--- /dev/null
+++ b/pmd/tool/config/checkstyle-config.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.2//EN" "http://www.puppycrawl.com/dtds/configuration_1_2.dtd">
+<module name="Checker">
+
+    <property name="severity"           value="warning"/>
+
+    <!-- JDocPackage
+    TODO: I don't know if this one is really relevant
+    <module name="PackageHtml">
+        <property name="severity"   value="error"/>
+    </module>
+    -->
+
+    <module name="TreeWalker">
+
+		<!-- RegexpHeader -->
+		<!--
+			Assert if header is :
+/**
+ * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
+ */
+		   -->
+        <module name="RegexpHeader">
+            <property
+                name="header"
+                value="^\/\*\*[ ]*$\n^[ ]+\*[ ]+BSD-style license; for more info see http:\/\/pmd.sourceforge.net/license.html[ ]*\n[ ]+\*\/[ ]*$"/>
+        </module>
+
+         <!-- JDocHtmlValid, JDocHeader -->
+        <module name="JavadocStyle">
+            <property name="checkFirstSentence" value="false"/>
+            <property name="checkEmptyJavadoc"  value="true"/>
+            <property name="severity"           value="error"/>
+        </module>
+
+        <!-- JDocHeader -->
+        <module name="JavadocType">
+            <property name="versionFormat"      value="\S"/>
+            <property name="authorFormat"       value="\S"/>
+            <property name="severity"           value="error"/>
+        </module>
+
+        <!-- JDocMethod-1, JDocMethod-3, JDocException-1 -->
+        <module name="JavadocMethod">
+            <property name="severity"   value="error"/>
+            <property name="scope"      value="package"/>
+        </module>
+
+        <!-- JDocMethod-1 -->
+        <module name="JavadocVariable">
+            <property name="severity"   value="error"/>
+            <property name="scope"      value="package"/>
+        </module>
+
+        <!-- AvoidStarImport -->
+        <module name="AvoidStarImport">
+            <property name="severity"   value="error"/>
+        </module>
+	</module>
+</module>