diff --git a/pom.xml b/pom.xml
index 3a83b32cc..2eb242fce 100644
--- a/pom.xml
+++ b/pom.xml
@@ -82,6 +82,8 @@
     </organization>
 
     <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+
         <currentVersion>${project.version}</currentVersion>
         <struts2.springPlatformVersion>4.1.6.RELEASE</struts2.springPlatformVersion>
         <ognl.version>3.1.15</ognl.version>
@@ -90,12 +92,8 @@
         <tiles-request.version>1.0.6</tiles-request.version>
         <log4j2.version>2.9.0</log4j2.version>
 
-        <!-- SCM Site Configuration -->
-        <site.mainDirectory>${project.build.directory}/site</site.mainDirectory>
-        <siteContent.path>${site.mainDirectory}/staging</siteContent.path>
-        <scmCheckout.path>${site.mainDirectory}/scm</scmCheckout.path>
-        <siteDeploy.url>file://${siteContent.path}</siteDeploy.url>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <!-- Site generation -->
+        <fluido-skin.version>1.6</fluido-skin.version>
     </properties>
 
     <profiles>
@@ -257,22 +255,18 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-source-plugin</artifactId>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-scm-publish-plugin</artifactId>
-                <configuration>
-                    <checkoutDirectory>${scmCheckout.path}</checkoutDirectory>
-                    <content>${siteContent.path}</content>
-                </configuration>
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-site-plugin</artifactId>
                 <configuration>
-                    <stagingSiteURL>${siteDeploy.url}</stagingSiteURL>
                     <relativizeDecorationLinks>false</relativizeDecorationLinks>
                 </configuration>
                 <dependencies>
+                    <dependency>
+                        <groupId>org.apache.maven.doxia</groupId>
+                        <artifactId>doxia-core</artifactId>
+                        <version>1.7</version>
+                    </dependency>
                     <dependency>
                         <groupId>org.apache.maven.doxia</groupId>
                         <artifactId>doxia-module-markdown</artifactId>
@@ -291,6 +285,9 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-project-info-reports-plugin</artifactId>
+                <configuration>
+                    <dependencyLocationsEnabled>false</dependencyLocationsEnabled>
+                </configuration>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>