diff --git a/pom.xml b/pom.xml
index b4b35df..43d18b4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.myfaces</groupId>
         <artifactId>myfaces</artifactId>
-        <version>11</version>
+        <version>15</version>
     </parent>
 
     <groupId>org.apache.myfaces.extensions.cdi</groupId>
@@ -47,13 +47,21 @@
         </repository>
     </repositories>
 
+<!--
     <distributionManagement>
         <site>
             <id>apache.website</id>
             <url>scpexe://people.apache.org/www/myfaces.apache.org/extensions/cdi</url>
         </site>
+    </distributionManagement>-->
+    <distributionManagement>
+      <site>
+        <id>myfaces-local-staging</id>
+        <name>Apache Website</name>
+        <url>scp://localhost/${user.home}/myfaces-site/${siteModule.path}</url>
+      </site>
     </distributionManagement>
-
+  
     <issueManagement>
         <system>jira</system>
         <url>http://issues.apache.org/jira/browse/EXTCDI</url>
@@ -104,6 +112,15 @@
         <trinidad2.version>2.0.0</trinidad2.version>
 
         <maven.jetty.plugin.version>7.1.5.v20100705</maven.jetty.plugin.version>
+        <!-- SITE GENERATION -->
+        <siteModule.path>extensions/cdi</siteModule.path>
+        <site.mainDirectory>${user.home}/myfaces-site/checkout</site.mainDirectory>
+        <siteContent.path>${user.home}/myfaces-site/site/${siteModule.path}</siteContent.path>
+        <!-- it's a default location for performance reason (not checkout the content all the time)
+            you can override this value in your settings. -->
+        <scmCheckout.path>\${site.mainDirectory}/${siteModule.path}</scmCheckout.path>
+        <siteDeploy.url>file://${user.home}/myfaces-site/site/${siteModule.path}</siteDeploy.url>
+        <siteScmPublish.url>scm:svn:https://svn.apache.org/repos/asf/myfaces/site/publish/</siteScmPublish.url>        
     </properties>
 
     <dependencyManagement>
@@ -455,6 +472,16 @@
     </dependencies>
 
     <build>
+
+        <!-- Since Maven 3.0, this is required to add scpexe as protocol for deploy. -->
+        <extensions>
+          <extension>
+            <groupId>org.apache.maven.wagon</groupId>
+            <artifactId>wagon-ssh-external</artifactId>
+            <version>1.0-beta-7</version>
+          </extension>
+        </extensions>
+
         <pluginManagement>
             <plugins>
                 <plugin>
@@ -468,6 +495,46 @@
                         </archive>
                     </configuration>
                 </plugin>
+                <!-- SITE GENERATION -->
+                <plugin>
+                    <artifactId>maven-javadoc-plugin</artifactId>
+                    <version>2.9.1</version>
+                </plugin>
+                <plugin>
+                  <artifactId>maven-site-plugin</artifactId>
+                  <version>3.3</version>
+                </plugin>
+                <plugin>
+                    <artifactId>maven-jxr-plugin</artifactId>
+                    <version>2.3</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.codehaus.mojo</groupId>
+                    <artifactId>taglist-maven-plugin</artifactId>
+                    <version>2.4</version>
+                </plugin>
+                <plugin>
+                    <artifactId>maven-changelog-plugin</artifactId>
+                    <version>2.2</version>
+                </plugin>
+                <plugin>
+                    <artifactId>maven-pmd-plugin</artifactId>
+                    <version>3.0.1</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.codehaus.mojo</groupId>
+                    <artifactId>findbugs-maven-plugin</artifactId>
+                    <version>2.5.2</version>
+                </plugin>
+                <plugin>
+                  <artifactId>maven-project-info-reports-plugin</artifactId>
+                  <version>2.7</version>
+                </plugin>
+                <plugin>
+                  <groupId>org.codehaus.mojo</groupId>
+                  <artifactId>cobertura-maven-plugin</artifactId>
+                  <version>2.6</version>
+                </plugin>                
             </plugins>
         </pluginManagement>
 
@@ -573,6 +640,26 @@
                     <preparationGoals>clean install</preparationGoals>
                 </configuration>
             </plugin>
+            
+            <plugin>
+              <groupId>org.apache.maven.plugins</groupId>
+              <artifactId>maven-scm-publish-plugin</artifactId>
+              <version>1.0-beta-2</version>
+              <configuration>
+                <pubScmUrl>${siteScmPublish.url}</pubScmUrl>
+                <tryUpdate>true</tryUpdate>
+                <checkoutDirectory>${scmCheckout.path}</checkoutDirectory>
+                <content>\${siteContent.path}</content>
+              </configuration>
+            </plugin>
+            <plugin>
+              <groupId>org.apache.maven.plugins</groupId>
+              <artifactId>maven-site-plugin</artifactId>
+              <configuration>
+                <stagingRepositoryId>myfaces-local-staging</stagingRepositoryId>
+                <stagingSiteURL>${siteDeploy.url}</stagingSiteURL>
+              </configuration>
+            </plugin>            
         </plugins>
     </build>
 
diff --git a/src/site/site.xml b/src/site/site.xml
index b24338e..5414803 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -35,7 +35,7 @@
     <skin>
         <groupId>org.apache.myfaces.maven</groupId>
         <artifactId>myfaces-site-skin</artifactId>
-        <version>2</version>
+        <version>3</version>
     </skin>
 
     <body>