diff --git a/activemq-all/pom.xml b/activemq-all/pom.xml
index 417494c363..62b58e9b0d 100644
--- a/activemq-all/pom.xml
+++ b/activemq-all/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.activemq</groupId>
     <artifactId>activemq-parent</artifactId>
-    <version>5.4-SNAPSHOT</version>
+    <version>5.4.0</version>
   </parent>
 
   <artifactId>activemq-all</artifactId>
diff --git a/activemq-blueprint/pom.xml b/activemq-blueprint/pom.xml
index 688a9739d3..ca402c8d3b 100644
--- a/activemq-blueprint/pom.xml
+++ b/activemq-blueprint/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.activemq</groupId>
     <artifactId>activemq-parent</artifactId>
-    <version>5.4-SNAPSHOT</version>
+    <version>5.4.0</version>
   </parent>
 
   <artifactId>activemq-blueprint</artifactId>
diff --git a/activemq-camel/pom.xml b/activemq-camel/pom.xml
index 76917de0f9..e7148fc063 100755
--- a/activemq-camel/pom.xml
+++ b/activemq-camel/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.activemq</groupId>
     <artifactId>activemq-parent</artifactId>
-    <version>5.4-SNAPSHOT</version>
+    <version>5.4.0</version>
   </parent>
 
   <artifactId>activemq-camel</artifactId>
diff --git a/activemq-console/pom.xml b/activemq-console/pom.xml
index 86acce48d2..a04d0e6358 100644
--- a/activemq-console/pom.xml
+++ b/activemq-console/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.activemq</groupId>
     <artifactId>activemq-parent</artifactId>
-    <version>5.4-SNAPSHOT</version>
+    <version>5.4.0</version>
   </parent>
 
   <artifactId>activemq-console</artifactId>
diff --git a/activemq-core/pom.xml b/activemq-core/pom.xml
index b423a86579..69da9fd697 100755
--- a/activemq-core/pom.xml
+++ b/activemq-core/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.activemq</groupId>
     <artifactId>activemq-parent</artifactId>
-    <version>5.4-SNAPSHOT</version>
+    <version>5.4.0</version>
   </parent>
 
   <artifactId>activemq-core</artifactId>
diff --git a/activemq-fileserver/pom.xml b/activemq-fileserver/pom.xml
index ad3a215378..90941360af 100755
--- a/activemq-fileserver/pom.xml
+++ b/activemq-fileserver/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.activemq</groupId>
     <artifactId>activemq-parent</artifactId>
-    <version>5.4-SNAPSHOT</version>
+    <version>5.4.0</version>
   </parent>
 
   <artifactId>activemq-fileserver</artifactId>
diff --git a/activemq-jaas/pom.xml b/activemq-jaas/pom.xml
index cbb8600887..6289fe48ce 100644
--- a/activemq-jaas/pom.xml
+++ b/activemq-jaas/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.activemq</groupId>
     <artifactId>activemq-parent</artifactId>
-    <version>5.4-SNAPSHOT</version>
+    <version>5.4.0</version>
   </parent>
 
   <artifactId>activemq-jaas</artifactId>
diff --git a/activemq-jmdns_1.0/pom.xml b/activemq-jmdns_1.0/pom.xml
index f9fe2a8013..f56e2c5c8e 100644
--- a/activemq-jmdns_1.0/pom.xml
+++ b/activemq-jmdns_1.0/pom.xml
@@ -19,7 +19,7 @@
   <parent>
     <artifactId>activemq-parent</artifactId>
     <groupId>org.apache.activemq</groupId>
-    <version>5.4-SNAPSHOT</version>
+    <version>5.4.0</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>activemq-jmdns_1.0</artifactId>
diff --git a/activemq-karaf/pom.xml b/activemq-karaf/pom.xml
index d2ad9987ef..4aa3c8661c 100644
--- a/activemq-karaf/pom.xml
+++ b/activemq-karaf/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.activemq</groupId>
     <artifactId>activemq-parent</artifactId>
-    <version>5.4-SNAPSHOT</version>
+    <version>5.4.0</version>
   </parent>
 
   <artifactId>activemq-karaf</artifactId>
diff --git a/activemq-openwire-generator/pom.xml b/activemq-openwire-generator/pom.xml
index e11b903a54..2b781e10ac 100644
--- a/activemq-openwire-generator/pom.xml
+++ b/activemq-openwire-generator/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.activemq</groupId>
     <artifactId>activemq-parent</artifactId>
-    <version>5.4-SNAPSHOT</version>
+    <version>5.4.0</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
diff --git a/activemq-optional/pom.xml b/activemq-optional/pom.xml
index 76875308db..7f463b3d1f 100755
--- a/activemq-optional/pom.xml
+++ b/activemq-optional/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.activemq</groupId>
     <artifactId>activemq-parent</artifactId>
-    <version>5.4-SNAPSHOT</version>
+    <version>5.4.0</version>
   </parent>
 
   <artifactId>activemq-optional</artifactId>
diff --git a/activemq-pool/pom.xml b/activemq-pool/pom.xml
index fbc0f757a6..34b97f0d5b 100755
--- a/activemq-pool/pom.xml
+++ b/activemq-pool/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.activemq</groupId>
     <artifactId>activemq-parent</artifactId>
-    <version>5.4-SNAPSHOT</version>
+    <version>5.4.0</version>
   </parent>
 
   <artifactId>activemq-pool</artifactId>
diff --git a/activemq-ra/pom.xml b/activemq-ra/pom.xml
index 3b0d2fe370..e7d86d3090 100755
--- a/activemq-ra/pom.xml
+++ b/activemq-ra/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.activemq</groupId>
     <artifactId>activemq-parent</artifactId>
-    <version>5.4-SNAPSHOT</version>
+    <version>5.4.0</version>
   </parent>
 
   <artifactId>activemq-ra</artifactId>
diff --git a/activemq-rar/pom.xml b/activemq-rar/pom.xml
index 9be7345ae6..1968845dba 100644
--- a/activemq-rar/pom.xml
+++ b/activemq-rar/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.activemq</groupId>
     <artifactId>activemq-parent</artifactId>
-    <version>5.4-SNAPSHOT</version>
+    <version>5.4.0</version>
   </parent>
 
   <artifactId>activemq-rar</artifactId>
diff --git a/activemq-run/pom.xml b/activemq-run/pom.xml
index 5bb3332d8e..17a68efd6a 100644
--- a/activemq-run/pom.xml
+++ b/activemq-run/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.activemq</groupId>
     <artifactId>activemq-parent</artifactId>
-    <version>5.4-SNAPSHOT</version>
+    <version>5.4.0</version>
   </parent>
 
   <artifactId>activemq-run</artifactId>
diff --git a/activemq-spring/pom.xml b/activemq-spring/pom.xml
index aba6a654ac..8e71d15344 100755
--- a/activemq-spring/pom.xml
+++ b/activemq-spring/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.activemq</groupId>
     <artifactId>activemq-parent</artifactId>
-    <version>5.4-SNAPSHOT</version>
+    <version>5.4.0</version>
   </parent>
 
   <artifactId>activemq-spring</artifactId>
diff --git a/activemq-tooling/maven-activemq-memtest-plugin/pom.xml b/activemq-tooling/maven-activemq-memtest-plugin/pom.xml
index 5361e2bcdb..acb68f013d 100644
--- a/activemq-tooling/maven-activemq-memtest-plugin/pom.xml
+++ b/activemq-tooling/maven-activemq-memtest-plugin/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.activemq.tooling</groupId>
     <artifactId>activemq-tooling</artifactId>
-    <version>5.4-SNAPSHOT</version>
+    <version>5.4.0</version>
   </parent>
 
   <artifactId>maven-activemq-memtest-plugin</artifactId>
diff --git a/activemq-tooling/maven-activemq-perf-plugin/pom.xml b/activemq-tooling/maven-activemq-perf-plugin/pom.xml
index d046c964d8..1dd99d7eca 100644
--- a/activemq-tooling/maven-activemq-perf-plugin/pom.xml
+++ b/activemq-tooling/maven-activemq-perf-plugin/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.apache.activemq.tooling</groupId>
         <artifactId>activemq-tooling</artifactId>
-        <version>5.4-SNAPSHOT</version>
+        <version>5.4.0</version>
 	</parent>
 
     <artifactId>maven-activemq-perf-plugin</artifactId>
diff --git a/activemq-tooling/maven-activemq-plugin/pom.xml b/activemq-tooling/maven-activemq-plugin/pom.xml
index 0e1930f11f..ad57336e24 100644
--- a/activemq-tooling/maven-activemq-plugin/pom.xml
+++ b/activemq-tooling/maven-activemq-plugin/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.activemq.tooling</groupId>
     <artifactId>activemq-tooling</artifactId>
-    <version>5.4-SNAPSHOT</version>
+    <version>5.4.0</version>
   </parent>
 
   <artifactId>maven-activemq-plugin</artifactId>
diff --git a/activemq-tooling/pom.xml b/activemq-tooling/pom.xml
index 74c36c9382..59f81b9ef4 100644
--- a/activemq-tooling/pom.xml
+++ b/activemq-tooling/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.activemq</groupId>
     <artifactId>activemq-parent</artifactId>
-    <version>5.4-SNAPSHOT</version>
+    <version>5.4.0</version>
   </parent>
 
   <groupId>org.apache.activemq.tooling</groupId>
diff --git a/activemq-web-console/pom.xml b/activemq-web-console/pom.xml
index a2de4a86a4..9ebdc8fe5d 100755
--- a/activemq-web-console/pom.xml
+++ b/activemq-web-console/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.activemq</groupId>
     <artifactId>activemq-parent</artifactId>
-    <version>5.4-SNAPSHOT</version>
+    <version>5.4.0</version>
   </parent>
 
   <artifactId>activemq-web-console</artifactId>
diff --git a/activemq-web-demo/pom.xml b/activemq-web-demo/pom.xml
index 7227a33a8e..fae6e7f9ba 100755
--- a/activemq-web-demo/pom.xml
+++ b/activemq-web-demo/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.activemq</groupId>
     <artifactId>activemq-parent</artifactId>
-    <version>5.4-SNAPSHOT</version>
+    <version>5.4.0</version>
   </parent>
 
   <artifactId>activemq-web-demo</artifactId>
diff --git a/activemq-web/pom.xml b/activemq-web/pom.xml
index 50d739121f..bec6c28dda 100755
--- a/activemq-web/pom.xml
+++ b/activemq-web/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.activemq</groupId>
     <artifactId>activemq-parent</artifactId>
-    <version>5.4-SNAPSHOT</version>
+    <version>5.4.0</version>
   </parent>
 
   <artifactId>activemq-web</artifactId>
diff --git a/activemq-xmpp/pom.xml b/activemq-xmpp/pom.xml
index 8ffe124579..a9e669d060 100755
--- a/activemq-xmpp/pom.xml
+++ b/activemq-xmpp/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.activemq</groupId>
     <artifactId>activemq-parent</artifactId>
-    <version>5.4-SNAPSHOT</version>
+    <version>5.4.0</version>
   </parent>
 
   <artifactId>activemq-xmpp</artifactId>
diff --git a/assembly/pom.xml b/assembly/pom.xml
index 8d02e95ef5..3138b2184e 100755
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.activemq</groupId>
     <artifactId>activemq-parent</artifactId>
-    <version>5.4-SNAPSHOT</version>
+    <version>5.4.0</version>
   </parent>
 
   <artifactId>apache-activemq</artifactId>
diff --git a/kahadb/pom.xml b/kahadb/pom.xml
index 027ef84f9b..728bffd628 100755
--- a/kahadb/pom.xml
+++ b/kahadb/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.apache.activemq</groupId>
     <artifactId>activemq-parent</artifactId>
-    <version>5.4-SNAPSHOT</version>
+    <version>5.4.0</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/pom.xml b/pom.xml
index 932f84bebe..b9cfe2370b 100755
--- a/pom.xml
+++ b/pom.xml
@@ -25,13 +25,13 @@
 
   <groupId>org.apache.activemq</groupId>
   <artifactId>activemq-parent</artifactId>
-  <version>5.4-SNAPSHOT</version>
+  <version>5.4.0</version>
   <packaging>pom</packaging>
   <name>ActiveMQ</name>
   <inceptionYear>2005</inceptionYear>
 
   <properties>
-    <activemq-version>5.4-SNAPSHOT</activemq-version>
+    <activemq-version>5.4.0</activemq-version>
     <siteId>activemq-${activemq-version}</siteId>
     <projectName>Apache ActiveMQ</projectName>
     <!-- base url for site deployment.  See distribution management for full url.  Override this in settings.xml for staging -->
@@ -159,9 +159,9 @@
   </modules>
 
   <scm>
-    <connection>scm:svn:https://svn.apache.org/repos/asf/activemq/trunk</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/activemq/trunk</developerConnection>
-    <url>http://svn.apache.org/viewvc/activemq/trunk/</url>
+    <connection>scm:svn:https://svn.apache.org/repos/asf/activemq/tags/activemq-5.4.0</connection>
+    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/activemq/tags/activemq-5.4.0</developerConnection>
+    <url>http://svn.apache.org/viewvc/activemq/tags/activemq-5.4.0</url>
   </scm>
   
   <repositories>