diff --git a/pmd-core/pom.xml b/pmd-core/pom.xml
index 3f653b6707..e831916fc9 100644
--- a/pmd-core/pom.xml
+++ b/pmd-core/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>net.sourceforge.pmd</groupId>
         <artifactId>pmd</artifactId>
-        <version>5.3.6-SNAPSHOT</version>
+        <version>5.3.6</version>
     </parent>
 
     <properties>
diff --git a/pmd-cpp/pom.xml b/pmd-cpp/pom.xml
index 482aaa5a8f..02fb8b4a7c 100644
--- a/pmd-cpp/pom.xml
+++ b/pmd-cpp/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>net.sourceforge.pmd</groupId>
         <artifactId>pmd</artifactId>
-        <version>5.3.6-SNAPSHOT</version>
+        <version>5.3.6</version>
     </parent>
 
     <properties>
diff --git a/pmd-cs/pom.xml b/pmd-cs/pom.xml
index b83a2f72a0..36040ecdeb 100644
--- a/pmd-cs/pom.xml
+++ b/pmd-cs/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>net.sourceforge.pmd</groupId>
         <artifactId>pmd</artifactId>
-        <version>5.3.6-SNAPSHOT</version>
+        <version>5.3.6</version>
     </parent>
 
     <properties>
diff --git a/pmd-dist/pom.xml b/pmd-dist/pom.xml
index 84aafc2677..d8bd63859a 100644
--- a/pmd-dist/pom.xml
+++ b/pmd-dist/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>net.sourceforge.pmd</groupId>
         <artifactId>pmd</artifactId>
-        <version>5.3.6-SNAPSHOT</version>
+        <version>5.3.6</version>
     </parent>
 
     <properties>
diff --git a/pmd-fortran/pom.xml b/pmd-fortran/pom.xml
index 3da7de1d52..9bb7bb89f3 100644
--- a/pmd-fortran/pom.xml
+++ b/pmd-fortran/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>net.sourceforge.pmd</groupId>
         <artifactId>pmd</artifactId>
-        <version>5.3.6-SNAPSHOT</version>
+        <version>5.3.6</version>
     </parent>
 
     <properties>
diff --git a/pmd-go/pom.xml b/pmd-go/pom.xml
index 0f7dd0e6a8..491d71762f 100644
--- a/pmd-go/pom.xml
+++ b/pmd-go/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>net.sourceforge.pmd</groupId>
         <artifactId>pmd</artifactId>
-        <version>5.3.6-SNAPSHOT</version>
+        <version>5.3.6</version>
     </parent>
 
     <properties>
diff --git a/pmd-java/pom.xml b/pmd-java/pom.xml
index 5b69b2bac7..bd1d4893bc 100644
--- a/pmd-java/pom.xml
+++ b/pmd-java/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>net.sourceforge.pmd</groupId>
         <artifactId>pmd</artifactId>
-        <version>5.3.6-SNAPSHOT</version>
+        <version>5.3.6</version>
     </parent>
 
     <properties>
diff --git a/pmd-javascript/pom.xml b/pmd-javascript/pom.xml
index b125340695..b0eb642a16 100644
--- a/pmd-javascript/pom.xml
+++ b/pmd-javascript/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>net.sourceforge.pmd</groupId>
         <artifactId>pmd</artifactId>
-        <version>5.3.6-SNAPSHOT</version>
+        <version>5.3.6</version>
     </parent>
 
     <properties>
diff --git a/pmd-jsp/pom.xml b/pmd-jsp/pom.xml
index da08657a35..7d2fb6cf86 100644
--- a/pmd-jsp/pom.xml
+++ b/pmd-jsp/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>net.sourceforge.pmd</groupId>
         <artifactId>pmd</artifactId>
-        <version>5.3.6-SNAPSHOT</version>
+        <version>5.3.6</version>
     </parent>
 
     <properties>
diff --git a/pmd-matlab/pom.xml b/pmd-matlab/pom.xml
index 102187dd3a..a9985fdd36 100644
--- a/pmd-matlab/pom.xml
+++ b/pmd-matlab/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>net.sourceforge.pmd</groupId>
         <artifactId>pmd</artifactId>
-        <version>5.3.6-SNAPSHOT</version>
+        <version>5.3.6</version>
     </parent>
 
     <properties>
diff --git a/pmd-objectivec/pom.xml b/pmd-objectivec/pom.xml
index 229827eec9..e9bd6f25aa 100644
--- a/pmd-objectivec/pom.xml
+++ b/pmd-objectivec/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>net.sourceforge.pmd</groupId>
         <artifactId>pmd</artifactId>
-        <version>5.3.6-SNAPSHOT</version>
+        <version>5.3.6</version>
     </parent>
 
     <properties>
diff --git a/pmd-php/pom.xml b/pmd-php/pom.xml
index 38cebdcf94..1ab323a94f 100644
--- a/pmd-php/pom.xml
+++ b/pmd-php/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>net.sourceforge.pmd</groupId>
         <artifactId>pmd</artifactId>
-        <version>5.3.6-SNAPSHOT</version>
+        <version>5.3.6</version>
     </parent>
 
     <properties>
diff --git a/pmd-plsql/pom.xml b/pmd-plsql/pom.xml
index 5bb22ae943..3825553bc9 100644
--- a/pmd-plsql/pom.xml
+++ b/pmd-plsql/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>net.sourceforge.pmd</groupId>
         <artifactId>pmd</artifactId>
-        <version>5.3.6-SNAPSHOT</version>
+        <version>5.3.6</version>
     </parent>
 
     <properties>
diff --git a/pmd-python/pom.xml b/pmd-python/pom.xml
index 514bf31b66..dd3ad2757f 100644
--- a/pmd-python/pom.xml
+++ b/pmd-python/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>net.sourceforge.pmd</groupId>
         <artifactId>pmd</artifactId>
-        <version>5.3.6-SNAPSHOT</version>
+        <version>5.3.6</version>
     </parent>
 
     <properties>
diff --git a/pmd-ruby/pom.xml b/pmd-ruby/pom.xml
index 9681044f7e..add90741e3 100644
--- a/pmd-ruby/pom.xml
+++ b/pmd-ruby/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>net.sourceforge.pmd</groupId>
         <artifactId>pmd</artifactId>
-        <version>5.3.6-SNAPSHOT</version>
+        <version>5.3.6</version>
     </parent>
 
     <properties>
diff --git a/pmd-scala/pom.xml b/pmd-scala/pom.xml
index e248917b0d..0f16b68653 100644
--- a/pmd-scala/pom.xml
+++ b/pmd-scala/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>net.sourceforge.pmd</groupId>
         <artifactId>pmd</artifactId>
-        <version>5.3.6-SNAPSHOT</version>
+        <version>5.3.6</version>
     </parent>
 
     <properties>
diff --git a/pmd-test/pom.xml b/pmd-test/pom.xml
index ed39dd390e..6c5f1941fc 100644
--- a/pmd-test/pom.xml
+++ b/pmd-test/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>net.sourceforge.pmd</groupId>
         <artifactId>pmd</artifactId>
-        <version>5.3.6-SNAPSHOT</version>
+        <version>5.3.6</version>
     </parent>
 
     <properties>
diff --git a/pmd-vm/pom.xml b/pmd-vm/pom.xml
index 63c75f8fec..bfe2f08190 100644
--- a/pmd-vm/pom.xml
+++ b/pmd-vm/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>net.sourceforge.pmd</groupId>
         <artifactId>pmd</artifactId>
-        <version>5.3.6-SNAPSHOT</version>
+        <version>5.3.6</version>
     </parent>
 
     <properties>
diff --git a/pmd-xml/pom.xml b/pmd-xml/pom.xml
index bbfb756b0e..3ec09f103a 100644
--- a/pmd-xml/pom.xml
+++ b/pmd-xml/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>net.sourceforge.pmd</groupId>
         <artifactId>pmd</artifactId>
-        <version>5.3.6-SNAPSHOT</version>
+        <version>5.3.6</version>
     </parent>
 
     <properties>
diff --git a/pom.xml b/pom.xml
index da8098d0f4..f8660955d6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>net.sourceforge.pmd</groupId>
     <artifactId>pmd</artifactId>
-    <version>5.3.6-SNAPSHOT</version>
+    <version>5.3.6</version>
     <packaging>pom</packaging>
     <name>PMD</name>
 
@@ -244,7 +244,7 @@
         <connection>scm:git:git://github.com/pmd/pmd.git</connection>
         <developerConnection>scm:git:ssh://git@github.com/pmd/pmd.git</developerConnection>
         <url>https://github.com/pmd/pmd</url>
-        <tag>pmd/5.3.x</tag>
+        <tag>pmd_releases/5.3.6</tag>
     </scm>
     <distributionManagement>
         <site>