diff --git a/integration/pom.xml b/integration/pom.xml
index 240a8ca8..288c9bf5 100644
--- a/integration/pom.xml
+++ b/integration/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.slf4j</groupId>
 		<artifactId>slf4j-parent</artifactId>
-    	<version>1.6.4-SNAPSHOT</version>
+    	<version>1.6.4</version>
 	</parent>
 	
 	<modelVersion>4.0.0</modelVersion>
diff --git a/jcl-over-slf4j/pom.xml b/jcl-over-slf4j/pom.xml
index e4b384c2..9c3cd769 100644
--- a/jcl-over-slf4j/pom.xml
+++ b/jcl-over-slf4j/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>org.slf4j</groupId>
 		<artifactId>slf4j-parent</artifactId>
-    <version>1.6.4-SNAPSHOT</version>
+    <version>1.6.4</version>
 	</parent>
 	
 	<modelVersion>4.0.0</modelVersion>
diff --git a/jul-to-slf4j/pom.xml b/jul-to-slf4j/pom.xml
index 8d0e6093..abd063b3 100644
--- a/jul-to-slf4j/pom.xml
+++ b/jul-to-slf4j/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.slf4j</groupId>
     <artifactId>slf4j-parent</artifactId>
-    <version>1.6.4-SNAPSHOT</version>
+    <version>1.6.4</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/log4j-over-slf4j/pom.xml b/log4j-over-slf4j/pom.xml
index eca58de4..94c62ad1 100644
--- a/log4j-over-slf4j/pom.xml
+++ b/log4j-over-slf4j/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.slf4j</groupId>
     <artifactId>slf4j-parent</artifactId>
-    <version>1.6.4-SNAPSHOT</version>
+    <version>1.6.4</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/osgi-over-slf4j/pom.xml b/osgi-over-slf4j/pom.xml
index aaf0953f..fed86fa8 100644
--- a/osgi-over-slf4j/pom.xml
+++ b/osgi-over-slf4j/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.slf4j</groupId>
     <artifactId>slf4j-parent</artifactId>
-    <version>1.6.4-SNAPSHOT</version>
+    <version>1.6.4</version>
   </parent>
   
   <modelVersion>4.0.0</modelVersion>
diff --git a/pom.xml b/pom.xml
index 326fa16c..1ab95e70 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
 
   <groupId>org.slf4j</groupId>
   <artifactId>slf4j-parent</artifactId>
-  <version>1.6.4-SNAPSHOT</version>
+  <version>1.6.4</version>
 
   <packaging>pom</packaging>
   <name>SLF4J</name>
@@ -95,6 +95,14 @@
 
 
   <build>
+    <extensions>
+      <extension>
+        <groupId>org.apache.maven.wagon</groupId>
+        <artifactId>wagon-ssh</artifactId>
+        <version>2.0</version>
+      </extension>
+    </extensions>
+
     <resources>
       <resource>
         <directory>src/main/resources</directory>
@@ -149,51 +157,6 @@
         </executions>
       </plugin>
 
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-javadoc-plugin</artifactId>
-        <version>2.8</version>
-        <configuration>
-          <aggregate>true</aggregate>
-          <excludePackageNames>org.slf4j.migrator:org.slf4j.migrator.*
-          </excludePackageNames>
-          <links>
-            <link>
-              http://java.sun.com/j2se/1.5.0/docs/api
-            </link>
-          </links>
-          <groups>
-            <group>
-              <title>SLF4J packages</title>
-              <packages>org.slf4j:org.slf4j.*</packages>
-            </group>
-
-            <group>
-              <title>SLF4J extensions</title>
-              <packages>
-                org.slf4j.profiler:org.slf4j.ext:org.slf4j.instrumentation:org.slf4j.agent
-              </packages>
-            </group>
-
-            <group>
-              <title>Jakarta Commons Logging packages</title>
-              <packages>org.apache.commons.*</packages>
-            </group>
-
-            <group>
-              <title>Apache log4j</title>
-              <packages>org.apache.log4j</packages>
-            </group>
-
-            <group>
-              <title>java.util.logging (JUL) to SLF4J bridge</title>
-              <packages>org.slf4j.bridge</packages>
-            </group>
-
-          </groups>
-        </configuration>
-      </plugin>
-
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-assembly-plugin</artifactId>
@@ -216,12 +179,78 @@
         <executions>
           <execution>
             <id>parse-version</id>
-            <goals>                                                                                    <goal>parse-version</goal>
+            <goals>
+              <goal>parse-version</goal>
             </goals>
           </execution>
         </executions>
       </plugin>
 
+      <!-- ====== site plugin ===== -->
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-site-plugin</artifactId>
+        <version>3.0</version>
+        <configuration>
+          <reportPlugins>
+            <plugin>
+              <groupId>org.apache.maven.plugins</groupId>
+              <artifactId>maven-jxr-plugin</artifactId>
+              <version>2.3</version>
+              <configuration>
+                <aggregate>true</aggregate>
+                <javadocDir>target/site/apidocs/</javadocDir>
+                <linkJavadoc>true</linkJavadoc>
+              </configuration>
+            </plugin>
+            <plugin>
+              <groupId>org.apache.maven.plugins</groupId>
+              <artifactId>maven-javadoc-plugin</artifactId>
+              <version>2.8</version>
+              <configuration>
+                <aggregate>true</aggregate>
+                <excludePackageNames>org.slf4j.migrator:org.slf4j.migrator.*
+                </excludePackageNames>
+                <links>
+                  <link>
+                    http://java.sun.com/j2se/1.5.0/docs/api
+                  </link>
+                </links>
+                <groups>
+                  <group>
+                    <title>SLF4J packages</title>
+                    <packages>org.slf4j:org.slf4j.*</packages>
+                  </group>
+
+                  <group>
+                    <title>SLF4J extensions</title>
+                    <packages>
+                      org.slf4j.profiler:org.slf4j.ext:org.slf4j.instrumentation:org.slf4j.agent
+                    </packages>
+                  </group>
+
+                  <group>
+                    <title>Jakarta Commons Logging packages</title>
+                    <packages>org.apache.commons.*</packages>
+                  </group>
+
+                  <group>
+                    <title>Apache log4j</title>
+                    <packages>org.apache.log4j</packages>
+                  </group>
+
+                  <group>
+                    <title>java.util.logging (JUL) to SLF4J bridge</title>
+                    <packages>org.slf4j.bridge</packages>
+                  </group>
+
+                </groups>
+              </configuration>
+            </plugin>
+
+          </reportPlugins>
+        </configuration>
+      </plugin>
     </plugins>
 
   </build>
@@ -360,43 +389,6 @@
     </pluginRepository>
   </pluginRepositories>
 
-  <reporting>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-site-plugin</artifactId>
-        <version>2.0.1</version>
-      </plugin>
-
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-project-info-reports-plugin</artifactId>
-        <version>2.4</version>
-
-        <reportSets>
-          <reportSet>
-            <reports/>
-          </reportSet>
-        </reportSets>
-      </plugin>
-
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jxr-plugin</artifactId>
-        <version>2.3</version>
-        <configuration>
-          <aggregate>true</aggregate>
-          <javadocDir>target/site/apidocs/</javadocDir>
-          <linkJavadoc>true</linkJavadoc>
-        </configuration>
-      </plugin>
-
-
-    </plugins>
-
-  </reporting>
-
-
   <scm>
     <connection>scm:svn:http://svn.slf4j.org/repos/slf4j/trunk</connection>
     <developerConnection>scm:svn:https://svn.slf4j.org/repos/slf4j/trunk
diff --git a/slf4j-api/pom.xml b/slf4j-api/pom.xml
index 8aa54d7a..83b4c7fd 100644
--- a/slf4j-api/pom.xml
+++ b/slf4j-api/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.slf4j</groupId>
     <artifactId>slf4j-parent</artifactId>
-    <version>1.6.4-SNAPSHOT</version>
+    <version>1.6.4</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/slf4j-ext/pom.xml b/slf4j-ext/pom.xml
index b4c31c95..cd7bec21 100644
--- a/slf4j-ext/pom.xml
+++ b/slf4j-ext/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.slf4j</groupId>
     <artifactId>slf4j-parent</artifactId>
-    <version>1.6.4-SNAPSHOT</version>
+    <version>1.6.4</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/slf4j-ext/src/test/java/org/slf4j/dummyExt/package.html b/slf4j-ext/src/test/java/org/slf4j/dummyExt/package.html
index ddd4f3ad..4ed5eaa9 100644
--- a/slf4j-ext/src/test/java/org/slf4j/dummyExt/package.html
+++ b/slf4j-ext/src/test/java/org/slf4j/dummyExt/package.html
@@ -1,4 +1,8 @@
+<html>
+<body>
 Tests related to the org.slfj.ext package. However, location information code
 required the caller class (XLogger) to have a different prefix than
 the test class XLoggerTest. This is ensured by having the test class
-placed in a different package.
\ No newline at end of file
+placed in a different package.
+</body>
+</html>
\ No newline at end of file
diff --git a/slf4j-jcl/pom.xml b/slf4j-jcl/pom.xml
index c007f498..0bceb522 100644
--- a/slf4j-jcl/pom.xml
+++ b/slf4j-jcl/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>org.slf4j</groupId>
 		<artifactId>slf4j-parent</artifactId>
-		<version>1.6.4-SNAPSHOT</version>
+		<version>1.6.4</version>
 	</parent>
 	
 	<modelVersion>4.0.0</modelVersion>
diff --git a/slf4j-jdk14/pom.xml b/slf4j-jdk14/pom.xml
index 8d8c4c99..438a20fb 100644
--- a/slf4j-jdk14/pom.xml
+++ b/slf4j-jdk14/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.slf4j</groupId>
 		<artifactId>slf4j-parent</artifactId>
-    	<version>1.6.4-SNAPSHOT</version>
+    	<version>1.6.4</version>
 	</parent>
 	
 	<modelVersion>4.0.0</modelVersion>
diff --git a/slf4j-log4j12/pom.xml b/slf4j-log4j12/pom.xml
index 8a979d6c..ef3218c6 100644
--- a/slf4j-log4j12/pom.xml
+++ b/slf4j-log4j12/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.slf4j</groupId>
 		<artifactId>slf4j-parent</artifactId>
-        <version>1.6.4-SNAPSHOT</version>
+        <version>1.6.4</version>
 	</parent>
 	
 	<modelVersion>4.0.0</modelVersion>
diff --git a/slf4j-migrator/pom.xml b/slf4j-migrator/pom.xml
index f0be206f..18042861 100644
--- a/slf4j-migrator/pom.xml
+++ b/slf4j-migrator/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 	  <groupId>org.slf4j</groupId>
       <artifactId>slf4j-parent</artifactId>
-      <version>1.6.4-SNAPSHOT</version>
+      <version>1.6.4</version>
 	</parent>
 	
 	<modelVersion>4.0.0</modelVersion>
diff --git a/slf4j-nop/pom.xml b/slf4j-nop/pom.xml
index 4403bd24..30e6fdd4 100644
--- a/slf4j-nop/pom.xml
+++ b/slf4j-nop/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.slf4j</groupId>
 		<artifactId>slf4j-parent</artifactId>
-    	<version>1.6.4-SNAPSHOT</version>
+    	<version>1.6.4</version>
 	</parent>
 	
 	<modelVersion>4.0.0</modelVersion>
diff --git a/slf4j-osgi-integration-test/pom.xml b/slf4j-osgi-integration-test/pom.xml
index e311f4c6..9d427370 100644
--- a/slf4j-osgi-integration-test/pom.xml
+++ b/slf4j-osgi-integration-test/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.slf4j</groupId>
 		<artifactId>slf4j-parent</artifactId>
-		<version>1.6.4-SNAPSHOT</version>
+		<version>1.6.4</version>
 	</parent>
 	
 	<modelVersion>4.0.0</modelVersion>
diff --git a/slf4j-osgi-test-bundle/pom.xml b/slf4j-osgi-test-bundle/pom.xml
index edaeae78..ecf9650f 100644
--- a/slf4j-osgi-test-bundle/pom.xml
+++ b/slf4j-osgi-test-bundle/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.slf4j</groupId>
 		<artifactId>slf4j-parent</artifactId>
-		<version>1.6.4-SNAPSHOT</version>
+		<version>1.6.4</version>
 	</parent>
 	
 	<modelVersion>4.0.0</modelVersion>
diff --git a/slf4j-simple/pom.xml b/slf4j-simple/pom.xml
index 7d735778..05ee7bd5 100644
--- a/slf4j-simple/pom.xml
+++ b/slf4j-simple/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.slf4j</groupId>
     <artifactId>slf4j-parent</artifactId>
-    <version>1.6.4-SNAPSHOT</version>
+    <version>1.6.4</version>
   </parent>
 	
 	<modelVersion>4.0.0</modelVersion>
diff --git a/slf4j-site/pom.xml b/slf4j-site/pom.xml
index 1e8925f9..b55b4443 100644
--- a/slf4j-site/pom.xml
+++ b/slf4j-site/pom.xml
@@ -1,43 +1,42 @@
 <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/maven-v4_0_0.xsd">
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
-	<parent>
-		<groupId>org.slf4j</groupId>
-		<artifactId>slf4j-parent</artifactId>
-    <version>1.6.4-SNAPSHOT</version>
-	</parent>
-	
-	<modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.slf4j</groupId>
+    <artifactId>slf4j-parent</artifactId>
+    <version>1.6.4</version>
+  </parent>
 
-	<groupId>org.slf4j</groupId>
-	<artifactId>slf4j-site</artifactId>
-	<packaging>jar</packaging>
-	<name>SLF4J Site</name>
+  <modelVersion>4.0.0</modelVersion>
 
-	<url>http://www.slf4j.org</url>
+  <groupId>org.slf4j</groupId>
+  <artifactId>slf4j-site</artifactId>
+  <packaging>jar</packaging>
+  <name>SLF4J Site</name>
 
-	<build>
-		<resources>
-			<resource>
-				<directory>src/site/pages</directory>
-				<!-- 
-					We're saving filtered html docs in a temporary folder
-					and telling the site plug in to get the docs there.
-				-->
+  <url>http://www.slf4j.org</url>
+
+  <build>
+    <resources>
+      <resource>
+        <directory>src/site/pages</directory>
+        <!--We're saving filtered html docs in a temporary folder-->
+        <!--and telling the site plug in to get the docs there.-->
         <targetPath>../../../target/site</targetPath>
-				<filtering>true</filtering>
-			</resource>
-		</resources>
-      <plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-site-plugin</artifactId>
-				<configuration>
-					<outputDirectory>${project.parent.basedir}/target/site</outputDirectory>
-				</configuration>
-			</plugin>
-      </plugins>
-	</build>
+        <filtering>true</filtering>
+      </resource>
+    </resources>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-site-plugin</artifactId>
+        <configuration>
+          <outputDirectory>${project.parent.basedir}/target/site
+          </outputDirectory>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
 
 </project>
\ No newline at end of file