diff --git a/ports/odbccpp/portfile.cmake b/ports/odbccpp/portfile.cmake
new file mode 100644
index 00000000000000..72e5dd7bd0ea09
--- /dev/null
+++ b/ports/odbccpp/portfile.cmake
@@ -0,0 +1,32 @@
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO SAP/odbc-cpp-wrapper
+    REF "v${VERSION}"
+    SHA512 c36d83b0ec5a560c2e845001594f549d1cc39d721e25345cbc6525458ec1591e01e5ae49cacd01807eed86db38ed717d55d63c94d7e7179010752044855bf838
+    HEAD_REF master
+    PATCHES
+        use-vcpkg-unixodbc.patch
+)
+
+vcpkg_list(SET options)
+if(VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_OSX)
+    list(APPEND options -DODBCCPP_USE_UNIXODBC=ON)
+endif()
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+        -DCMAKE_DISABLE_FIND_PACKAGE_GTest=ON
+        -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON
+       ${options}
+)
+
+vcpkg_cmake_install()
+
+vcpkg_copy_pdbs()
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+
+vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT})
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
\ No newline at end of file
diff --git a/ports/odbccpp/use-vcpkg-unixodbc.patch b/ports/odbccpp/use-vcpkg-unixodbc.patch
new file mode 100644
index 00000000000000..29988e5482959b
--- /dev/null
+++ b/ports/odbccpp/use-vcpkg-unixodbc.patch
@@ -0,0 +1,20 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -4,7 +4,15 @@ SET(CMAKE_CXX_STANDARD 11)
+ 
+ INCLUDE(GNUInstallDirs)
+ INCLUDE(CMakePackageConfigHelpers)
+ 
+-FIND_PACKAGE(ODBC REQUIRED)
++IF(ODBCCPP_USE_UNIXODBC)
++    FIND_PACKAGE(unofficial-unixodbc CONFIG REQUIRED)
++    SET(ODBC_TARGET unofficial::unixodbc::unixodbc)
++    ADD_LIBRARY(ODBC::ODBC ALIAS ${ODBC_TARGET})
++ELSE()
++    FIND_PACKAGE(ODBC REQUIRED)
++    SET(ODBC_TARGET ODBC::ODBC)
++ENDIF()
++
+ FIND_PACKAGE(Doxygen)
+ FIND_PACKAGE(GTest)
+ 
\ No newline at end of file
diff --git a/ports/odbccpp/vcpkg.json b/ports/odbccpp/vcpkg.json
new file mode 100644
index 00000000000000..b7fcd34105612b
--- /dev/null
+++ b/ports/odbccpp/vcpkg.json
@@ -0,0 +1,22 @@
+{
+  "name": "odbccpp",
+  "version": "1.6",
+  "description": "An object-oriented C++ wrapper of the ODBC API from SAP",
+  "homepage": "https://github.com/SAP/odbc-cpp-wrapper",
+  "license": "Apache-2.0",
+  "supports": "!uwp & !android",
+  "dependencies": [
+    {
+      "name": "unixodbc",
+      "platform": "linux | osx"
+    },
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
+}
diff --git a/versions/baseline.json b/versions/baseline.json
index c8dbe15e5a21b1..a0935bfc22aa2d 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -4424,15 +4424,15 @@
       "baseline": "6.23.0",
       "port-version": 0
     },
-    "kf6i18n": {
+    "kf6breezeicons": {
       "baseline": "6.23.0",
       "port-version": 0
     },
-    "kf6globalaccel": {
+    "kf6codecs": {
       "baseline": "6.23.0",
       "port-version": 0
     },
-    "kf6itemmodels": {
+    "kf6coreaddons": {
       "baseline": "6.23.0",
       "port-version": 0
     },
@@ -4440,15 +4440,15 @@
       "baseline": "6.23.0",
       "port-version": 0
     },
-    "kf6coreaddons": {
+    "kf6globalaccel": {
       "baseline": "6.23.0",
       "port-version": 0
     },
-    "kf6codecs": {
+    "kf6i18n": {
       "baseline": "6.23.0",
       "port-version": 0
     },
-    "kf6breezeicons": {
+    "kf6itemmodels": {
       "baseline": "6.23.0",
       "port-version": 0
     },
@@ -7156,6 +7156,10 @@
       "baseline": "1.10.0",
       "port-version": 0
     },
+    "odbccpp": {
+      "baseline": "1.6",
+      "port-version": 0
+    },
     "ode": {
       "baseline": "0.16.6",
       "port-version": 0
diff --git a/versions/o-/odbccpp.json b/versions/o-/odbccpp.json
new file mode 100644
index 00000000000000..c1dd0acc3057a0
--- /dev/null
+++ b/versions/o-/odbccpp.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "4cf05da841cdd917850bf0f5d90a6f2fa4f6da87",
+      "version": "1.6",
+      "port-version": 0
+    }
+  ]
+}