diff --git a/pmd-apex/pom.xml b/pmd-apex/pom.xml
index 20d3d2ea16..c3a2c7cc30 100644
--- a/pmd-apex/pom.xml
+++ b/pmd-apex/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>net.sourceforge.pmd</groupId>
 		<artifactId>pmd</artifactId>
-		<version>5.8.0-SNAPSHOT</version>
+		<version>5.8.0</version>
 	</parent>
 
 	<properties>
diff --git a/pmd-core/pom.xml b/pmd-core/pom.xml
index 933309e20a..60216a0540 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.8.0-SNAPSHOT</version>
+        <version>5.8.0</version>
     </parent>
 
     <properties>
diff --git a/pmd-cpp/pom.xml b/pmd-cpp/pom.xml
index 4478ab8d57..76901bedbd 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.8.0-SNAPSHOT</version>
+        <version>5.8.0</version>
     </parent>
 
     <properties>
diff --git a/pmd-cs/pom.xml b/pmd-cs/pom.xml
index 7eadf29781..59cd6621d6 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.8.0-SNAPSHOT</version>
+        <version>5.8.0</version>
     </parent>
 
     <properties>
diff --git a/pmd-dist/pom.xml b/pmd-dist/pom.xml
index 4e944cb0c7..7e84231bcf 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.8.0-SNAPSHOT</version>
+        <version>5.8.0</version>
     </parent>
 
     <properties>
diff --git a/pmd-fortran/pom.xml b/pmd-fortran/pom.xml
index dd3a81124a..1a2d13ed14 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.8.0-SNAPSHOT</version>
+        <version>5.8.0</version>
     </parent>
 
     <properties>
diff --git a/pmd-go/pom.xml b/pmd-go/pom.xml
index 7c2601d43b..eecac5383c 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.8.0-SNAPSHOT</version>
+        <version>5.8.0</version>
     </parent>
 
     <properties>
diff --git a/pmd-groovy/pom.xml b/pmd-groovy/pom.xml
index 45ab37b39b..a553447ee7 100644
--- a/pmd-groovy/pom.xml
+++ b/pmd-groovy/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>net.sourceforge.pmd</groupId>
         <artifactId>pmd</artifactId>
-        <version>5.8.0-SNAPSHOT</version>
+        <version>5.8.0</version>
     </parent>
 
     <properties>
diff --git a/pmd-java/pom.xml b/pmd-java/pom.xml
index 80cbde388b..1c2b914833 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.8.0-SNAPSHOT</version>
+        <version>5.8.0</version>
     </parent>
 
     <properties>
diff --git a/pmd-java8/pom.xml b/pmd-java8/pom.xml
index c56613acd1..2ee1626276 100644
--- a/pmd-java8/pom.xml
+++ b/pmd-java8/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>net.sourceforge.pmd</groupId>
         <artifactId>pmd</artifactId>
-        <version>5.8.0-SNAPSHOT</version>
+        <version>5.8.0</version>
     </parent>
 
     <properties>
diff --git a/pmd-javascript/pom.xml b/pmd-javascript/pom.xml
index 7bd12890b0..136ec690ff 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.8.0-SNAPSHOT</version>
+        <version>5.8.0</version>
     </parent>
 
     <properties>
diff --git a/pmd-jsp/pom.xml b/pmd-jsp/pom.xml
index c5dbc860c5..f1c4efb751 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.8.0-SNAPSHOT</version>
+        <version>5.8.0</version>
     </parent>
 
     <properties>
diff --git a/pmd-matlab/pom.xml b/pmd-matlab/pom.xml
index 66643c011f..9045e2053e 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.8.0-SNAPSHOT</version>
+        <version>5.8.0</version>
     </parent>
 
     <properties>
diff --git a/pmd-objectivec/pom.xml b/pmd-objectivec/pom.xml
index 04cc7afec6..a352519788 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.8.0-SNAPSHOT</version>
+        <version>5.8.0</version>
     </parent>
 
     <properties>
diff --git a/pmd-perl/pom.xml b/pmd-perl/pom.xml
index 13e5b2a113..37452887cc 100644
--- a/pmd-perl/pom.xml
+++ b/pmd-perl/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>net.sourceforge.pmd</groupId>
         <artifactId>pmd</artifactId>
-        <version>5.8.0-SNAPSHOT</version>
+        <version>5.8.0</version>
     </parent>
 
     <properties>
diff --git a/pmd-php/pom.xml b/pmd-php/pom.xml
index 77e5016b5c..bda5a0fbf2 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.8.0-SNAPSHOT</version>
+        <version>5.8.0</version>
     </parent>
 
     <properties>
diff --git a/pmd-plsql/pom.xml b/pmd-plsql/pom.xml
index b49ee1a6d7..1afe0296e5 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.8.0-SNAPSHOT</version>
+        <version>5.8.0</version>
     </parent>
 
     <properties>
diff --git a/pmd-python/pom.xml b/pmd-python/pom.xml
index 331309ebc8..98fd509364 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.8.0-SNAPSHOT</version>
+        <version>5.8.0</version>
     </parent>
 
     <properties>
diff --git a/pmd-ruby/pom.xml b/pmd-ruby/pom.xml
index 44614b83c7..381667928b 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.8.0-SNAPSHOT</version>
+        <version>5.8.0</version>
     </parent>
 
     <properties>
diff --git a/pmd-scala/pom.xml b/pmd-scala/pom.xml
index 56560fa778..d78b5bc57d 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.8.0-SNAPSHOT</version>
+        <version>5.8.0</version>
     </parent>
 
     <properties>
diff --git a/pmd-swift/pom.xml b/pmd-swift/pom.xml
index 0e3aec0ad4..c4c1a26298 100644
--- a/pmd-swift/pom.xml
+++ b/pmd-swift/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>net.sourceforge.pmd</groupId>
         <artifactId>pmd</artifactId>
-        <version>5.8.0-SNAPSHOT</version>
+        <version>5.8.0</version>
     </parent>
 
     <properties>
diff --git a/pmd-test/pom.xml b/pmd-test/pom.xml
index d4902e287e..54bec54090 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.8.0-SNAPSHOT</version>
+        <version>5.8.0</version>
     </parent>
 
     <properties>
diff --git a/pmd-ui/pom.xml b/pmd-ui/pom.xml
index 315d5d7a0a..7740b1da87 100644
--- a/pmd-ui/pom.xml
+++ b/pmd-ui/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>net.sourceforge.pmd</groupId>
         <artifactId>pmd</artifactId>
-        <version>5.8.0-SNAPSHOT</version>
+        <version>5.8.0</version>
     </parent>
 
     <properties>
diff --git a/pmd-visualforce/pom.xml b/pmd-visualforce/pom.xml
index de63d5c2c3..f8c3831346 100644
--- a/pmd-visualforce/pom.xml
+++ b/pmd-visualforce/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>net.sourceforge.pmd</groupId>
         <artifactId>pmd</artifactId>
-        <version>5.8.0-SNAPSHOT</version>
+        <version>5.8.0</version>
     </parent>
 
     <properties>
diff --git a/pmd-vm/pom.xml b/pmd-vm/pom.xml
index 9c027de35b..070e6a74f4 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.8.0-SNAPSHOT</version>
+        <version>5.8.0</version>
     </parent>
 
     <properties>
diff --git a/pmd-xml/pom.xml b/pmd-xml/pom.xml
index 57f9a769d4..e693edddc1 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.8.0-SNAPSHOT</version>
+        <version>5.8.0</version>
     </parent>
 
     <properties>
diff --git a/pom.xml b/pom.xml
index 63c87d9374..3df1c90e6c 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.8.0-SNAPSHOT</version>
+    <version>5.8.0</version>
     <packaging>pom</packaging>
     <name>PMD</name>
 
@@ -234,7 +234,7 @@ Additionally it includes CPD, the copy-paste-detector. CPD finds duplicated code
         <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>HEAD</tag>
+        <tag>pmd_releases/5.8.0</tag>
     </scm>
     <distributionManagement>
         <snapshotRepository>