diff --git a/ports/openmama/CONTROL b/ports/openmama/CONTROL
deleted file mode 100644
index 277e760ae1..0000000000
--- a/ports/openmama/CONTROL
+++ /dev/null
@@ -1,6 +0,0 @@
-Source: openmama
-Version: 6.3.1
-Build-Depends: libevent, apr, qpid-proton
-Supports: windows&(x64|x86)
-Homepage: https://github.com/OpenMAMA/OpenMAMA
-Description: OpenMAMA is a high performance vendor neutral lightweight wrapper that provides a common API interface to different middleware and messaging solutions across a variety of platforms and languages.
diff --git a/ports/openmama/portfile.cmake b/ports/openmama/portfile.cmake
index 78f4f186a6..dfd63074ae 100644
--- a/ports/openmama/portfile.cmake
+++ b/ports/openmama/portfile.cmake
@@ -2,8 +2,8 @@ vcpkg_find_acquire_program(FLEX)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
-    REPO OpenMAMA/OpenMAMA
-    REF c4925ee103add1a51c1d27be45b46d97af347f36 # https://github.com/OpenMAMA/OpenMAMA/tree/OpenMAMA-6.3.1-release
+    REPO finos/OpenMAMA
+    REF c4925ee103add1a51c1d27be45b46d97af347f36 # https://github.com/finos/OpenMAMA/releases/tag/OpenMAMA-6.3.1-release
     SHA512 e2773d082dd28e073fe81223fc113b1a5db7cd0d95e150e9f3f02c8c9483b9219b5d10682a125dd792c3a7877e15b90fd908084a4c89af4ec8d8c0389c282de2
     HEAD_REF next
 )
@@ -41,7 +41,14 @@ endif()
 # Vcpkg does not expect include files to be in the debug directory
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 
-# Vcpkg does not like this header name and shouldn't be required anyway, so remove it
-file(REMOVE "${CURRENT_PACKAGES_DIR}/include/platform.h")
+foreach(OPENMAMA_ROOT_HEADER destroyhandle.h platform.h list.h lookup2.h property.h timers.h wlock.h windows)
+    if(EXISTS "${CURRENT_PACKAGES_DIR}/include/${OPENMAMA_ROOT_HEADER}")
+        file(RENAME "${CURRENT_PACKAGES_DIR}/include/${OPENMAMA_ROOT_HEADER}" "${CURRENT_PACKAGES_DIR}/include/wombat/${OPENMAMA_ROOT_HEADER}")
+    endif()
+endforeach()
+
+vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/mama/integration/transport.h" "list.h" "wombat/list.h")
+vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/mama/integration/types.h" "list.h" "wombat/list.h")
+vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/mama/integration/mama.h" "property.h" "wombat/property.h")
 
 vcpkg_copy_pdbs()
diff --git a/ports/openmama/vcpkg.json b/ports/openmama/vcpkg.json
new file mode 100644
index 0000000000..ae3b795786
--- /dev/null
+++ b/ports/openmama/vcpkg.json
@@ -0,0 +1,13 @@
+{
+  "name": "openmama",
+  "version-semver": "6.3.1",
+  "port-version": 1,
+  "description": "OpenMAMA is a high performance vendor neutral lightweight wrapper that provides a common API interface to different middleware and messaging solutions across a variety of platforms and languages",
+  "homepage": "https://github.com/finos/OpenMAMA",
+  "supports": "windows & (x64 | x86)",
+  "dependencies": [
+    "apr",
+    "libevent",
+    "qpid-proton"
+  ]
+}
diff --git a/versions/baseline.json b/versions/baseline.json
index 391146eb86..8fb80742bc 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -4474,7 +4474,7 @@
     },
     "openmama": {
       "baseline": "6.3.1",
-      "port-version": 0
+      "port-version": 1
     },
     "openmesh": {
       "baseline": "8.1",
diff --git a/versions/o-/openmama.json b/versions/o-/openmama.json
index a96b358a1f..e34e2add3a 100644
--- a/versions/o-/openmama.json
+++ b/versions/o-/openmama.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "74e126369c9ba45cf7105e1b72871738acd24de5",
+      "version-semver": "6.3.1",
+      "port-version": 1
+    },
     {
       "git-tree": "6945e436fdfc5307d58f84ff5c76f6a34e2a8031",
       "version-string": "6.3.1",