diff --git a/ports/openssl/unix/CMakeLists.txt b/ports/openssl/unix/CMakeLists.txt
index 9cb6a5325dece5..0cff4f1d50951e 100644
--- a/ports/openssl/unix/CMakeLists.txt
+++ b/ports/openssl/unix/CMakeLists.txt
@@ -81,6 +81,10 @@ if (CMAKE_OSX_DEPLOYMENT_TARGET AND CMAKE_C_OSX_DEPLOYMENT_TARGET_FLAG)
 elseif((CMAKE_SYSTEM_NAME STREQUAL "Darwin") AND (VCPKG_TARGET_ARCHITECTURE MATCHES "arm64"))
   set(CFLAGS "${CFLAGS} -mmacosx-version-min=11.0")
 endif()
+# clang for Android x86 needs a workaround for their implementation of atomics
+if(CMAKE_C_COMPILER_ID STREQUAL "Clang" AND CMAKE_SYSTEM_NAME STREQUAL "Android" AND VCPKG_TARGET_ARCHITECTURE MATCHES "x86")
+    set(CFLAGS "${CFLAGS} -DBROKEN_CLANG_ATOMICS")
+endif()
 
 string(REGEX REPLACE "^ " "" CFLAGS "${CFLAGS}")
 
diff --git a/ports/openssl/vcpkg.json b/ports/openssl/vcpkg.json
index 507ecf971e565c..353d058a037850 100644
--- a/ports/openssl/vcpkg.json
+++ b/ports/openssl/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "openssl",
   "version": "3.0.3",
-  "port-version": 2,
+  "port-version": 3,
   "description": "OpenSSL is an open source project that provides a robust, commercial-grade, and full-featured toolkit for the Transport Layer Security (TLS) and Secure Sockets Layer (SSL) protocols. It is also a general-purpose cryptography library.",
   "homepage": "https://www.openssl.org",
   "license": "Apache-2.0",
diff --git a/versions/baseline.json b/versions/baseline.json
index 98000cfabe47b5..ae72d2202e6574 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -5182,7 +5182,7 @@
     },
     "openssl": {
       "baseline": "3.0.3",
-      "port-version": 2
+      "port-version": 3
     },
     "openssl-unix": {
       "baseline": "1.1.1h",
diff --git a/versions/o-/openssl.json b/versions/o-/openssl.json
index c312ffc0815879..25b431971f60aa 100644
--- a/versions/o-/openssl.json
+++ b/versions/o-/openssl.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "03f8e7e77fd71aaf31af19896c07deaa58b02662",
+      "version": "3.0.3",
+      "port-version": 3
+    },
     {
       "git-tree": "cdd8b7c5c9ebba05598bc90a58f224f13cf0b611",
       "version": "3.0.3",