diff --git a/ports/activemq-cpp/portfile.cmake b/ports/activemq-cpp/portfile.cmake
index 0645eaf234..595326c518 100644
--- a/ports/activemq-cpp/portfile.cmake
+++ b/ports/activemq-cpp/portfile.cmake
@@ -38,6 +38,12 @@ if (VCPKG_TARGET_IS_LINUX)
     file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/activemq-cpp-${VERSION}")
 
     vcpkg_copy_pdbs()
+
+    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin/activemqcpp-config" "${CURRENT_INSTALLED_DIR}" "`dirname $0`/../../..")
+    if(NOT VCPKG_BUILD_TYPE)
+        vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug/bin/activemqcpp-config" "${CURRENT_INSTALLED_DIR}/debug" "`dirname $0`/../../../..")
+        vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug/bin/activemqcpp-config" "${CURRENT_INSTALLED_DIR}" "`dirname $0`/../../..")
+    endif()
 else()
     set(ACTIVEMQCPP_MSVC_PROJ "${SOURCE_PATH}/vs2010-build/activemq-cpp.vcxproj")
 
@@ -126,5 +132,7 @@ else()
     vcpkg_clean_msbuild()
 endif()
 
+vcpkg_fixup_pkgconfig()
+
 file(INSTALL "${CURRENT_PORT_DIR}/activemq-cppConfig.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/activemq-cpp")
 file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/ports/activemq-cpp/vcpkg.json b/ports/activemq-cpp/vcpkg.json
index c2bdb9c173..1128611005 100644
--- a/ports/activemq-cpp/vcpkg.json
+++ b/ports/activemq-cpp/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "activemq-cpp",
   "version-semver": "3.9.5",
-  "port-version": 8,
+  "port-version": 9,
   "description": "Apache ActiveMQ is the most popular and powerful open source messaging and Integration Patterns server.",
   "supports": "!(uwp | osx)",
   "dependencies": [
diff --git a/versions/a-/activemq-cpp.json b/versions/a-/activemq-cpp.json
index 4869266c28..6403895d71 100644
--- a/versions/a-/activemq-cpp.json
+++ b/versions/a-/activemq-cpp.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "4f5d3901f612afe54e714fb14e47d343822e398e",
+      "version-semver": "3.9.5",
+      "port-version": 9
+    },
     {
       "git-tree": "ec8c68847a3d3950cec058e76a3963fac34fd682",
       "version-semver": "3.9.5",
diff --git a/versions/baseline.json b/versions/baseline.json
index b5596d4880..b04d186398 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -22,7 +22,7 @@
     },
     "activemq-cpp": {
       "baseline": "3.9.5",
-      "port-version": 8
+      "port-version": 9
     },
     "ade": {
       "baseline": "0.1.1f",