diff --git a/apache-qpid-jms-amqp-0-x/pom.xml b/apache-qpid-jms-amqp-0-x/pom.xml
index 9d1e8bc..97f62dc 100644
--- a/apache-qpid-jms-amqp-0-x/pom.xml
+++ b/apache-qpid-jms-amqp-0-x/pom.xml
@@ -19,7 +19,7 @@
   <parent>
     <groupId>org.apache.qpid</groupId>
     <artifactId>qpid-jms-amqp-0-x-parent</artifactId>
-    <version>6.4.0-SNAPSHOT</version>
+    <version>6.4.0</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/client/example/pom.xml b/client/example/pom.xml
index 0c8da28..d3d3b14 100644
--- a/client/example/pom.xml
+++ b/client/example/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.qpid</groupId>
     <artifactId>qpid-jms-amqp-0-x-parent</artifactId>
-    <version>6.4.0-SNAPSHOT</version>
+    <version>6.4.0</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
diff --git a/client/pom.xml b/client/pom.xml
index 59e99c7..f420d35 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.qpid</groupId>
     <artifactId>qpid-jms-amqp-0-x-parent</artifactId>
-    <version>6.4.0-SNAPSHOT</version>
+    <version>6.4.0</version>
   </parent>
 
   <artifactId>qpid-client</artifactId>
diff --git a/doc/jms-client-0-10/pom.xml b/doc/jms-client-0-10/pom.xml
index 7195591..c16c214 100644
--- a/doc/jms-client-0-10/pom.xml
+++ b/doc/jms-client-0-10/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.qpid</groupId>
         <artifactId>qpid-java-doc</artifactId>
-        <version>6.4.0-SNAPSHOT</version>
+        <version>6.4.0</version>
     </parent>
 
     <artifactId>qpid-java-doc-jms-client-0-10</artifactId>
diff --git a/doc/jms-client-0-8/pom.xml b/doc/jms-client-0-8/pom.xml
index ce99eea..1428399 100644
--- a/doc/jms-client-0-8/pom.xml
+++ b/doc/jms-client-0-8/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.qpid</groupId>
         <artifactId>qpid-java-doc</artifactId>
-        <version>6.4.0-SNAPSHOT</version>
+        <version>6.4.0</version>
     </parent>
 
     <artifactId>qpid-java-doc-jms-client-0-8</artifactId>
diff --git a/doc/pom.xml b/doc/pom.xml
index b3f235d..603be53 100644
--- a/doc/pom.xml
+++ b/doc/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.qpid</groupId>
         <artifactId>qpid-jms-amqp-0-x-parent</artifactId>
-        <version>6.4.0-SNAPSHOT</version>
+        <version>6.4.0</version>
     </parent>
 
     <artifactId>qpid-java-doc</artifactId>
diff --git a/pom.xml b/pom.xml
index 5e5a3ea..0136482 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@
 
   <groupId>org.apache.qpid</groupId>
   <artifactId>qpid-jms-amqp-0-x-parent</artifactId>
-  <version>6.4.0-SNAPSHOT</version>
+  <version>6.4.0</version>
   <packaging>pom</packaging>
 
   <name>Apache Qpid JMS AMQP 0-x Parent</name>
@@ -65,7 +65,7 @@
     <connection>scm:git:https://gitbox.apache.org/repos/asf/qpid-jms-amqp-0-x.git</connection>
     <developerConnection>scm:git:https://gitbox.apache.org/repos/asf/qpid-jms-amqp-0-x.git</developerConnection>
     <url>https://gitbox.apache.org/repos/asf/qpid-jms-amqp-0-x.git</url>
-    <tag>HEAD</tag>
+    <tag>6.4.0</tag>
   </scm>
 
   <distributionManagement>
diff --git a/systests/pom.xml b/systests/pom.xml
index 2440be6..6590863 100644
--- a/systests/pom.xml
+++ b/systests/pom.xml
@@ -15,15 +15,13 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<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">
+<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">
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
         <groupId>org.apache.qpid</groupId>
         <artifactId>qpid-jms-amqp-0-x-parent</artifactId>
-        <version>6.4.0-SNAPSHOT</version>
+        <version>6.4.0</version>
     </parent>
 
     <artifactId>qpid-client-systests</artifactId>
@@ -207,7 +205,7 @@
 
             <properties>
                 <qpid.systest.broker.executable>qpidd</qpid.systest.broker.executable>
-                <qpid.systest.broker.moduleDir></qpid.systest.broker.moduleDir>
+                <qpid.systest.broker.moduleDir />
                 <qpid.systest.broker_admin>org.apache.qpid.systest.core.cpp.SpawnQpidBrokerAdmin</qpid.systest.broker_admin>
             </properties>
             <build>