diff --git a/pmd/pom.xml b/pmd/pom.xml
index 49e2247298..55f4682d71 100644
--- a/pmd/pom.xml
+++ b/pmd/pom.xml
@@ -433,6 +433,29 @@
                 </configuration>
             </plugin>
 
+            <plugin>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <version>2.2.1</version>
+                <configuration>
+                    <descriptors>
+                       <descriptor>src/main/assembly/bin.xml</descriptor>
+                       <descriptor>src/main/assembly/src.xml</descriptor>
+                    </descriptors>
+                    <archiverConfig>
+                      <defaultDirectoryMode>493</defaultDirectoryMode> <!-- 0755 -->
+                    </archiverConfig>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>build-dist</id>
+                        <phase>post-site</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+
         </plugins>
     </build>
     <dependencies>
diff --git a/pmd/src/main/assembly/bin.xml b/pmd/src/main/assembly/bin.xml
new file mode 100644
index 0000000000..36aeaaa9a1
--- /dev/null
+++ b/pmd/src/main/assembly/bin.xml
@@ -0,0 +1,83 @@
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
+
+  <id>bin</id>
+  <formats>
+      <format>zip</format>
+  </formats>
+
+  <includeBaseDirectory>true</includeBaseDirectory>
+  <baseDirectory>pmd-${project.version}-bin</baseDirectory>
+
+  <fileSets>
+    <fileSet>
+        <includes>
+            <include>pmd-${project.version}.jar</include>
+        </includes>
+        <directory>${project.build.directory}</directory>
+        <outputDirectory>lib</outputDirectory>
+        <directoryMode>0755</directoryMode>
+        <fileMode>0644</fileMode>
+    </fileSet>
+
+    <fileSet>
+        <includes>
+            <include>bgastviewer.*</include>
+            <include>cpd.*</include>
+            <include>cpdgui.*</include>
+            <include>designer.*</include>
+            <include>pmd.*</include>
+        </includes>
+        <directory>bin</directory>
+        <outputDirectory>bin</outputDirectory>
+        <fileMode>0755</fileMode>
+        <directoryMode>0755</directoryMode>
+    </fileSet>
+
+    <fileSet>
+        <includes>
+            <include>LICENSE.txt</include>
+        </includes>
+        <outputDirectory>etc</outputDirectory>
+        <directoryMode>0755</directoryMode>
+        <fileMode>0644</fileMode>
+    </fileSet>
+    <fileSet>
+        <includes>
+            <include>changelog.txt</include>
+        </includes>
+        <directory>etc</directory>
+        <directoryMode>0755</directoryMode>
+        <fileMode>0644</fileMode>
+    </fileSet>
+    <fileSet>
+        <includes>
+            <include>*.xslt</include>
+            <include>*.js</include>
+            <include>*.gif</include>
+            <include>*.css</include>
+        </includes>
+        <directory>etc/xslt</directory>
+        <directoryMode>0755</directoryMode>
+        <fileMode>0644</fileMode>
+    </fileSet>
+
+    <fileSet>
+        <directory>${project.build.directory}/site</directory>
+        <outputDirectory>docs</outputDirectory>
+        <directoryMode>0755</directoryMode>
+        <fileMode>0644</fileMode>
+    </fileSet>
+  </fileSets>
+
+  <dependencySets>
+    <dependencySet>
+        <scope>runtime</scope>
+        <outputDirectory>lib</outputDirectory>
+        <directoryMode>0755</directoryMode>
+        <fileMode>0644</fileMode>
+        <useProjectArtifact>false</useProjectArtifact>
+    </dependencySet>
+  </dependencySets>
+
+</assembly>
diff --git a/pmd/src/main/assembly/src.xml b/pmd/src/main/assembly/src.xml
new file mode 100644
index 0000000000..69fe736758
--- /dev/null
+++ b/pmd/src/main/assembly/src.xml
@@ -0,0 +1,51 @@
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
+
+  <id>src</id>
+  <formats>
+      <format>zip</format>
+  </formats>
+
+  <includeBaseDirectory>true</includeBaseDirectory>
+  <baseDirectory>pmd-${project.version}-src</baseDirectory>
+
+  <fileSets>
+    <fileSet>
+        <includes>
+            <include>pmd-${project.version}.jar</include>
+        </includes>
+        <directory>${project.build.directory}</directory>
+        <outputDirectory>lib</outputDirectory>
+        <directoryMode>0755</directoryMode>
+        <fileMode>0644</fileMode>
+    </fileSet>
+
+    <fileSet>
+        <useDefaultExcludes>true</useDefaultExcludes>
+        <excludes>
+            <exclude>tools/config/clover2.license</exclude>
+            <exclude>${project.build.directory}/**</exclude>
+            <exclude>.settings/**</exclude>
+        </excludes>
+        <directoryMode>0755</directoryMode>
+        <fileMode>0644</fileMode>
+    </fileSet>
+
+    <fileSet>
+        <directory>${project.build.directory}/site</directory>
+        <outputDirectory>docs</outputDirectory>
+        <directoryMode>0755</directoryMode>
+        <fileMode>0644</fileMode>
+    </fileSet>
+  </fileSets>
+
+  <dependencySets>
+    <dependencySet>
+        <scope>test</scope>
+        <outputDirectory>lib</outputDirectory>
+        <directoryMode>0755</directoryMode>
+        <fileMode>0644</fileMode>
+        <useProjectArtifact>false</useProjectArtifact>
+    </dependencySet>
+  </dependencySets>
+</assembly>