diff --git a/pmd-eclipse-plugin/net.sourceforge.pmd.eclipse.p2updatesite/category.xml b/pmd-eclipse-plugin/net.sourceforge.pmd.eclipse.p2updatesite/category.xml
index 8f25fd672c..d1577c384a 100644
--- a/pmd-eclipse-plugin/net.sourceforge.pmd.eclipse.p2updatesite/category.xml
+++ b/pmd-eclipse-plugin/net.sourceforge.pmd.eclipse.p2updatesite/category.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site>
-    <feature url="features/net.sourceforge.pmd.eclipse_4.0.0.qualifier.jar" id="net.sourceforge.pmd.eclipse" version="4.0.0.qualifier">
-        <category name="pmd"/>
+   <description url="http://pmd.sourceforge.net/eclipse">
+       PMD for Eclipse Update Site
+   </description>
+
+    <feature url="features/net.sourceforge.pmd.eclipse_4.0.0.qualifier.jar"
+        id="net.sourceforge.pmd.eclipse"
+        version="4.0.0.qualifier">
+        <category name="pmdForEclipse4"/>
     </feature>
 
-    <category-def name="pmd" label="PMD"/>
+    <category-def name="pmdForEclipse4" label="PMD for Eclipse 4"/>
 </site>
diff --git a/pmd-eclipse-plugin/net.sourceforge.pmd.eclipse.p2updatesite/pom.xml b/pmd-eclipse-plugin/net.sourceforge.pmd.eclipse.p2updatesite/pom.xml
index 9cbf07b057..37ed41cace 100644
--- a/pmd-eclipse-plugin/net.sourceforge.pmd.eclipse.p2updatesite/pom.xml
+++ b/pmd-eclipse-plugin/net.sourceforge.pmd.eclipse.p2updatesite/pom.xml
@@ -12,4 +12,35 @@
   <artifactId>net.sourceforge.pmd.eclipse.p2updatesite</artifactId>
   <packaging>eclipse-repository</packaging>
 
+    <profiles>
+        <profile>
+            <id>publish-to-update-site</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.eclipse.tycho.extras</groupId>
+                        <artifactId>tycho-p2-extras-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>publish</id>
+                                <phase>install</phase>
+                                <goals>
+                                    <goal>mirror</goal>
+                                </goals>
+                                <configuration>
+                                    <source>
+                                        <repository>
+                                            <url>${project.build.directory}/repository</url>
+                                        </repository>
+                                    </source>
+                                    <append>true</append>
+                                    <destination>${eclipse.updatesite.path}</destination>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
 </project>
diff --git a/pmd-eclipse-plugin/pom.xml b/pmd-eclipse-plugin/pom.xml
index 775511c8d0..510d2dc327 100644
--- a/pmd-eclipse-plugin/pom.xml
+++ b/pmd-eclipse-plugin/pom.xml
@@ -169,6 +169,11 @@
             </baselineRepositories>
           </configuration>
         </plugin>
+        <plugin>
+          <groupId>org.eclipse.tycho.extras</groupId>
+          <artifactId>tycho-p2-extras-plugin</artifactId>
+          <version>${tycho-extras.version}</version>
+        </plugin>
       </plugins>
     </pluginManagement>
   </build>