diff --git a/activemq-cpp/RELEASE_NOTES.txt b/activemq-cpp/RELEASE_NOTES.txt
index 3c80fbc..e8a3e7a 100644
--- a/activemq-cpp/RELEASE_NOTES.txt
+++ b/activemq-cpp/RELEASE_NOTES.txt
@@ -1,4 +1,23 @@
 =========================================================================
+==  Release Notes for ActiveMQ CPP 3.8.4                               ==
+=========================================================================
+
+Bug
+
+    [AMQCPP-534] - Closing connection with setTransportListener to NULL may cause core dump
+    [AMQCPP-549] - Potential memory leak in consumer when delivering delayed ack.
+    [AMQCPP-550] - CMS (C++ client) crashed if getLocalHost failed
+    [AMQCPP-551] - EOFException when sending char in MapMessage between Java and C++
+    [AMQCPP-556] - setMessageListener on active session may leads to deadlock
+    [AMQCPP-558] - Port fix for AMQ-5513
+
+Improvement
+
+    [AMQCPP-548] - Too many temporary std::string in Mutex and decaf::lang::Integer::toString(int)
+    [AMQCPP-562] - Reduce memory delete and allocation in ArrayList
+
+
+=========================================================================
 ==  Release Notes for ActiveMQ CPP 3.8.3                               ==
 =========================================================================
 
diff --git a/activemq-cpp/activemq-cpp.spec b/activemq-cpp/activemq-cpp.spec
index 652c7e3..31e30f1 100644
--- a/activemq-cpp/activemq-cpp.spec
+++ b/activemq-cpp/activemq-cpp.spec
@@ -1,5 +1,5 @@
 Name:           activemq-cpp
-Version:        3.8.3
+Version:        3.8.4
 Release:        1%{?dist}
 Summary:        C++ Implementation of a JMS style Messaging Client
 
diff --git a/activemq-cpp/configure.ac b/activemq-cpp/configure.ac
index c86f8c6..146f401 100644
--- a/activemq-cpp/configure.ac
+++ b/activemq-cpp/configure.ac
@@ -20,7 +20,7 @@
 ## --------------------------------
 ## Initialization macros.
 ## --------------------------------
-AC_INIT(activemq-cpp, 3.8.3, dev@activemq.apache.org)
+AC_INIT(activemq-cpp, 3.8.4, 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 @@
 ACTIVEMQ_LIBRARY_NAME=activemq-cpp
 ACTIVEMQ_MAJOR_VERSION=3
 ACTIVEMQ_MINOR_VERSION=8
-ACTIVEMQ_PATCH_VERSION=3
+ACTIVEMQ_PATCH_VERSION=4
 ACTIVEMQ_VERSION=${ACTIVEMQ_MAJOR_VERSION}.${ACTIVEMQ_MINOR_VERSION}.${ACTIVEMQ_PATCH_VERSION}
 ACTIVEMQ_API_VERSION=${ACTIVEMQ_VERSION}
 
@@ -75,7 +75,7 @@
 ##   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:3:0
+ACTIVEMQ_LIBRARY_VERSION=18:4:0
 
 AC_SUBST(ACTIVEMQ_LIBRARY_NAME)
 AC_SUBST(ACTIVEMQ_VERSION)
diff --git a/activemq-cpp/src/main/activemq/core/ActiveMQConnectionMetaData.cpp b/activemq-cpp/src/main/activemq/core/ActiveMQConnectionMetaData.cpp
index 72658be..85c38fa 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::getProviderVersion() const {
-    return "3.8.3";
+    return "3.8.4";
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -66,7 +66,7 @@
 
 ////////////////////////////////////////////////////////////////////////////////
 int ActiveMQConnectionMetaData::getProviderPatchVersion() const {
-    return 3;
+    return 4;
 }
 
 ////////////////////////////////////////////////////////////////////////////////