diff --git a/pmd/etc/grammar/cpp.jj b/pmd-cpp/etc/grammar/cpp.jj
similarity index 100%
rename from pmd/etc/grammar/cpp.jj
rename to pmd-cpp/etc/grammar/cpp.jj
diff --git a/pmd-cpp/pom.xml b/pmd-cpp/pom.xml
new file mode 100644
index 0000000000..5a60f1e785
--- /dev/null
+++ b/pmd-cpp/pom.xml
@@ -0,0 +1,185 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>pmd-cpp</artifactId>
+    <name>PMD C++</name>
+
+    <parent>
+        <groupId>net.sourceforge.pmd</groupId>
+        <artifactId>pmd-aggregate</artifactId>
+        <version>5.1.4-SNAPSHOT</version>
+    </parent>
+
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-resources-plugin</artifactId>
+                <configuration>
+                    <useDefaultDelimiters>false</useDefaultDelimiters>
+                    <delimiters>
+                        <delimiter>${*}</delimiter>
+                    </delimiters>
+                </configuration>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <inherited>true</inherited>
+                <executions>
+                    <execution>
+                        <id>generate-sources</id>
+                        <phase>generate-sources</phase>
+                        <configuration>
+                            <target>
+                                <ant antfile="src/main/ant/alljavacc.xml">
+                                    <property name="target" value="${project.build.directory}/generated-sources/javacc" />
+                                    <property name="javacc.jar" value="${settings.localRepository}/net/java/dev/javacc/javacc/${javacc.version}/javacc-${javacc.version}.jar" />
+                                </ant>
+                            </target>
+                        </configuration>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>add-javacc-generated-sources</id>
+                        <goals>
+                            <goal>add-source</goal>
+                        </goals>
+                        <configuration>
+                            <sources>
+                                <source>${project.build.directory}/generated-sources/javacc</source>
+                            </sources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <!-- As Clover can be quite an hassle, know that you can skip 
+                it by using the following option when running mvn: $ mvn clean -Dmaven.clover.skip=true 
+                site -->
+            <plugin>
+                <groupId>com.atlassian.maven.plugins</groupId>
+                <artifactId>maven-clover2-plugin</artifactId>
+                <configuration>
+                    <jdk>${java.version}</jdk>
+                    <licenseLocation>${basedir}/../pmd/licences/clover2.license</licenseLocation>
+                </configuration>
+                <executions>
+                    <execution>
+                        <phase>pre-site</phase>
+                        <goals>
+                            <goal>instrument</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-site-plugin</artifactId>
+                <configuration>
+                    <xdocDirectory>${project.build.directory}/generated-xdocs</xdocDirectory>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+    <dependencies>
+        <dependency>
+            <groupId>net.sourceforge.pmd</groupId>
+            <artifactId>pmd</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>net.sourceforge.pmd</groupId>
+            <artifactId>pmd-test</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.ant</groupId>
+            <artifactId>ant</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.ant</groupId>
+            <artifactId>ant-testutil</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>jaxen</groupId>
+            <artifactId>jaxen</artifactId>
+            <exclusions>
+                <exclusion>
+                    <artifactId>xercesImpl</artifactId>
+                    <groupId>xerces</groupId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>xalan</artifactId>
+                    <groupId>xalan</groupId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>icu4j</artifactId>
+                    <groupId>com.ibm.icu</groupId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+          <groupId>com.beust</groupId>
+          <artifactId>jcommander</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.ow2.asm</groupId>
+            <artifactId>asm</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>net.sourceforge.saxon</groupId>
+            <artifactId>saxon</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>net.sourceforge.saxon</groupId>
+            <artifactId>saxon</artifactId>
+            <classifier>dom</classifier>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>xerces</groupId>
+            <artifactId>xercesImpl</artifactId>
+            <type>jar</type>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>net.java.dev.javacc</groupId>
+            <artifactId>javacc</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-all</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/pmd-cpp/src/main/ant/alljavacc.xml b/pmd-cpp/src/main/ant/alljavacc.xml
new file mode 100644
index 0000000000..4066ee3a6f
--- /dev/null
+++ b/pmd-cpp/src/main/ant/alljavacc.xml
@@ -0,0 +1,45 @@
+<project name="pmd" default="alljavacc" basedir="../../">
+
+    <property name="javacc-home.path" value="target/lib" />
+
+    <target name="alljavacc"
+            description="Generates all JavaCC aspects within PMD"
+            depends="checkUpToDate,init,cppjavacc,cleanup" />
+
+    <target name="checkUpToDate">
+        <uptodate property="javaccBuildNotRequired" targetfile="${target}/last-generated-timestamp">
+            <srcfiles dir="etc/grammar" includes="*.jj*"/>
+        </uptodate>
+        <echo message="up to date check: javaccBuildNotRequired=${javaccBuildNotRequired}"/>
+    </target>
+
+    <target name="init" unless="javaccBuildNotRequired">
+        <mkdir dir="${javacc-home.path}" />
+        <copy file="${javacc.jar}" tofile="${javacc-home.path}/javacc.jar" />
+
+        <mkdir dir="${target}"/>
+        <touch file="${target}/last-generated-timestamp"/>
+    </target>
+
+    <target name="cleanup">
+        <delete dir="${javacc-home.path}" />
+    </target>
+
+    <target name="cppjavacc" description="Generates the C++ grammar" unless="javaccBuildNotRequired">
+        <delete dir="${target}/net/sourceforge/pmd/lang/cpp/ast" />
+        <mkdir dir="${target}/net/sourceforge/pmd/lang/cpp/ast" />
+        <!-- Ensure generated using CharStream interface -->
+        <javacc static="false"
+                usercharstream="true"
+                target="etc/grammar/cpp.jj"
+                outputdirectory="${target}/net/sourceforge/pmd/lang/cpp/ast"
+                javacchome="${javacc-home.path}" />
+        <replace file="${target}/net/sourceforge/pmd/lang/cpp/ast/CppParserTokenManager.java"
+                 token="class CppParserTokenManager"
+                 value="class CppParserTokenManager extends net.sourceforge.pmd.lang.ast.AbstractTokenManager" />
+        <delete file="${target}/net/sourceforge/pmd/lang/cpp/ast/CharStream.java" />
+        <delete file="${target}/net/sourceforge/pmd/lang/cpp/ast/ParseException.java" />
+        <delete file="${target}/net/sourceforge/pmd/lang/cpp/ast/TokenMgrError.java" />
+    </target>
+	
+</project>
diff --git a/pmd/src/main/java/net/sourceforge/pmd/cpd/CPPLanguage.java b/pmd-cpp/src/main/java/net/sourceforge/pmd/cpd/CPPLanguage.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/cpd/CPPLanguage.java
rename to pmd-cpp/src/main/java/net/sourceforge/pmd/cpd/CPPLanguage.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/cpd/CPPTokenizer.java b/pmd-cpp/src/main/java/net/sourceforge/pmd/cpd/CPPTokenizer.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/cpd/CPPTokenizer.java
rename to pmd-cpp/src/main/java/net/sourceforge/pmd/cpd/CPPTokenizer.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/cpp/ContinuationReader.java b/pmd-cpp/src/main/java/net/sourceforge/pmd/lang/cpp/ContinuationReader.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/cpp/ContinuationReader.java
rename to pmd-cpp/src/main/java/net/sourceforge/pmd/lang/cpp/ContinuationReader.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/cpp/CppHandler.java b/pmd-cpp/src/main/java/net/sourceforge/pmd/lang/cpp/CppHandler.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/cpp/CppHandler.java
rename to pmd-cpp/src/main/java/net/sourceforge/pmd/lang/cpp/CppHandler.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/cpp/CppLanguageModule.java b/pmd-cpp/src/main/java/net/sourceforge/pmd/lang/cpp/CppLanguageModule.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/cpp/CppLanguageModule.java
rename to pmd-cpp/src/main/java/net/sourceforge/pmd/lang/cpp/CppLanguageModule.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/cpp/CppParser.java b/pmd-cpp/src/main/java/net/sourceforge/pmd/lang/cpp/CppParser.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/cpp/CppParser.java
rename to pmd-cpp/src/main/java/net/sourceforge/pmd/lang/cpp/CppParser.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/cpp/CppTokenManager.java b/pmd-cpp/src/main/java/net/sourceforge/pmd/lang/cpp/CppTokenManager.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/cpp/CppTokenManager.java
rename to pmd-cpp/src/main/java/net/sourceforge/pmd/lang/cpp/CppTokenManager.java
diff --git a/pmd-cpp/src/main/resources/META-INF/services/net.sourceforge.pmd.lang.Language b/pmd-cpp/src/main/resources/META-INF/services/net.sourceforge.pmd.lang.Language
new file mode 100644
index 0000000000..ecb3ec91fa
--- /dev/null
+++ b/pmd-cpp/src/main/resources/META-INF/services/net.sourceforge.pmd.lang.Language
@@ -0,0 +1 @@
+net.sourceforge.pmd.lang.cpp.CppLanguageModule
diff --git a/pmd/src/test/java/net/sourceforge/pmd/lang/cpp/ContinuationReaderTest.java b/pmd-cpp/src/test/java/net/sourceforge/pmd/lang/cpp/ContinuationReaderTest.java
similarity index 100%
rename from pmd/src/test/java/net/sourceforge/pmd/lang/cpp/ContinuationReaderTest.java
rename to pmd-cpp/src/test/java/net/sourceforge/pmd/lang/cpp/ContinuationReaderTest.java
diff --git a/pmd/src/main/ant/alljavacc.xml b/pmd/src/main/ant/alljavacc.xml
index 16e5203830..62bf7de2e9 100644
--- a/pmd/src/main/ant/alljavacc.xml
+++ b/pmd/src/main/ant/alljavacc.xml
@@ -4,7 +4,7 @@
 
     <target name="alljavacc"
             description="Generates all JavaCC aspects within PMD"
-            depends="checkUpToDate,init,dummyjjtree,jspjjtree,cppjavacc,cleanup" />
+            depends="checkUpToDate,init,dummyjjtree,jspjjtree,cleanup" />
 
     <target name="checkUpToDate">
         <uptodate property="javaccBuildNotRequired" targetfile="${target}/last-generated-timestamp">
@@ -146,21 +146,4 @@ public class]]></replacevalue>
         </delete>
     </target>
 
-    <target name="cppjavacc" description="Generates the C++ grammar" unless="javaccBuildNotRequired">
-        <delete dir="${target}/net/sourceforge/pmd/lang/cpp/ast" />
-        <mkdir dir="${target}/net/sourceforge/pmd/lang/cpp/ast" />
-        <!-- Ensure generated using CharStream interface -->
-        <javacc static="false"
-                usercharstream="true"
-                target="etc/grammar/cpp.jj"
-                outputdirectory="${target}/net/sourceforge/pmd/lang/cpp/ast"
-                javacchome="${javacc-home.path}" />
-        <replace file="${target}/net/sourceforge/pmd/lang/cpp/ast/CppParserTokenManager.java"
-                 token="class CppParserTokenManager"
-                 value="class CppParserTokenManager extends net.sourceforge.pmd.lang.ast.AbstractTokenManager" />
-        <delete file="${target}/net/sourceforge/pmd/lang/cpp/ast/CharStream.java" />
-        <delete file="${target}/net/sourceforge/pmd/lang/cpp/ast/ParseException.java" />
-        <delete file="${target}/net/sourceforge/pmd/lang/cpp/ast/TokenMgrError.java" />
-    </target>
-	
 </project>
diff --git a/pmd/src/main/resources/META-INF/services/net.sourceforge.pmd.lang.Language b/pmd/src/main/resources/META-INF/services/net.sourceforge.pmd.lang.Language
index a77173966e..e5bb864700 100644
--- a/pmd/src/main/resources/META-INF/services/net.sourceforge.pmd.lang.Language
+++ b/pmd/src/main/resources/META-INF/services/net.sourceforge.pmd.lang.Language
@@ -1,4 +1,3 @@
-net.sourceforge.pmd.lang.cpp.CppLanguageModule
 net.sourceforge.pmd.lang.fortran.FortranLanguageModule
 net.sourceforge.pmd.lang.jsp.JspLanguageModule
 net.sourceforge.pmd.lang.php.PhpLanguageModule
diff --git a/pom.xml b/pom.xml
index ef91a87a3e..6a7bd2c6e6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -632,6 +632,7 @@
         <module>pmd-javascript</module>
         <module>pmd-vm</module>
         <module>pmd-plsql</module>
+        <module>pmd-cpp</module>
         <module>pmd-dist</module>
     </modules>
 </project>