diff --git a/activemq-cpp-openwire-generator/pom.xml b/activemq-cpp-openwire-generator/pom.xml
index 3f0526942..62496bea2 100644
--- a/activemq-cpp-openwire-generator/pom.xml
+++ b/activemq-cpp-openwire-generator/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.activemq-cpp</groupId>
     <artifactId>activemq-cpp-pom</artifactId>
-    <version>3.8.4-SNAPSHOT</version>
+    <version>3.8.5-SNAPSHOT</version>
   </parent>
 
   <artifactId>activemq-cpp-openwire-generator</artifactId>
diff --git a/activemq-cpp/RELEASE_NOTES.txt b/activemq-cpp/RELEASE_NOTES.txt
index e8a3e7a3b..192dbb9b0 100644
--- a/activemq-cpp/RELEASE_NOTES.txt
+++ b/activemq-cpp/RELEASE_NOTES.txt
@@ -2,6 +2,10 @@
 ==  Release Notes for ActiveMQ CPP 3.8.4                               ==
 =========================================================================
 
+=========================================================================
+==  Release Notes for ActiveMQ CPP 3.8.4                               ==
+=========================================================================
+
 Bug
 
     [AMQCPP-534] - Closing connection with setTransportListener to NULL may cause core dump
diff --git a/activemq-cpp/configure.ac b/activemq-cpp/configure.ac
index 146f401a8..2c3ca4c45 100644
--- a/activemq-cpp/configure.ac
+++ b/activemq-cpp/configure.ac
@@ -20,7 +20,7 @@ AC_PREREQ(2.61)
 ## --------------------------------
 ## Initialization macros.
 ## --------------------------------
-AC_INIT(activemq-cpp, 3.8.4, dev@activemq.apache.org)
+AC_INIT(activemq-cpp, 3.8.5, dev@activemq.apache.org)
 AC_CONFIG_AUX_DIR(config)
 AC_CONFIG_SRCDIR(src/main/activemq/core/ActiveMQConnection.cpp)
 AC_CONFIG_MACRO_DIR([m4])
@@ -31,7 +31,7 @@ AC_CONFIG_MACRO_DIR([m4])
 ACTIVEMQ_LIBRARY_NAME=activemq-cpp
 ACTIVEMQ_MAJOR_VERSION=3
 ACTIVEMQ_MINOR_VERSION=8
-ACTIVEMQ_PATCH_VERSION=4
+ACTIVEMQ_PATCH_VERSION=5
 ACTIVEMQ_VERSION=${ACTIVEMQ_MAJOR_VERSION}.${ACTIVEMQ_MINOR_VERSION}.${ACTIVEMQ_PATCH_VERSION}
 ACTIVEMQ_API_VERSION=${ACTIVEMQ_VERSION}
 
@@ -75,7 +75,7 @@ AC_SUBST(CMSAPI_VERSION)
 ##   3. Programs may need to be changed, recompiled, relinked in order to use the new version. Bump
 ##      current, set revision and age to 0.
 ##
-ACTIVEMQ_LIBRARY_VERSION=18:4:0
+ACTIVEMQ_LIBRARY_VERSION=18:5:0
 
 AC_SUBST(ACTIVEMQ_LIBRARY_NAME)
 AC_SUBST(ACTIVEMQ_VERSION)
diff --git a/activemq-cpp/pom.xml b/activemq-cpp/pom.xml
index 76f489385..a266487df 100644
--- a/activemq-cpp/pom.xml
+++ b/activemq-cpp/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.activemq-cpp</groupId>
     <artifactId>activemq-cpp-pom</artifactId>
-    <version>3.8.4-SNAPSHOT</version>
+    <version>3.8.5-SNAPSHOT</version>
   </parent>
 
   <artifactId>activemq-cpp-library</artifactId>
diff --git a/activemq-cpp/src/main/activemq/core/ActiveMQConnectionMetaData.cpp b/activemq-cpp/src/main/activemq/core/ActiveMQConnectionMetaData.cpp
index 85c38fa30..03ab305e4 100644
--- a/activemq-cpp/src/main/activemq/core/ActiveMQConnectionMetaData.cpp
+++ b/activemq-cpp/src/main/activemq/core/ActiveMQConnectionMetaData.cpp
@@ -51,7 +51,7 @@ std::string ActiveMQConnectionMetaData::getCMSProviderName() const {
 
 ////////////////////////////////////////////////////////////////////////////////
 std::string ActiveMQConnectionMetaData::getProviderVersion() const {
-    return "3.8.4";
+    return "3.8.5";
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -66,7 +66,7 @@ int ActiveMQConnectionMetaData::getProviderMinorVersion() const {
 
 ////////////////////////////////////////////////////////////////////////////////
 int ActiveMQConnectionMetaData::getProviderPatchVersion() const {
-    return 4;
+    return 5;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/maven-cpptools-plugin/pom.xml b/maven-cpptools-plugin/pom.xml
index fe6ff5f49..11a3995d3 100644
--- a/maven-cpptools-plugin/pom.xml
+++ b/maven-cpptools-plugin/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.activemq-cpp</groupId>
     <artifactId>activemq-cpp-pom</artifactId>
-    <version>3.8.4-SNAPSHOT</version>
+    <version>3.8.5-SNAPSHOT</version>
   </parent>
 
   <artifactId>maven-cpptools-plugin</artifactId>
diff --git a/pom.xml b/pom.xml
index fec756ce1..9798bef7a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
 
   <groupId>org.apache.activemq-cpp</groupId>
   <artifactId>activemq-cpp-pom</artifactId>
-  <version>3.8.4-SNAPSHOT</version>
+  <version>3.8.5-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>ActiveMQ-CPP Project</name>
   <inceptionYear>2007</inceptionYear>