diff --git a/ports/libpq/CONTROL b/ports/libpq/CONTROL
index fa6ea6d91c1140..5d535ff7238fd7 100644
--- a/ports/libpq/CONTROL
+++ b/ports/libpq/CONTROL
@@ -1,6 +1,6 @@
 Source: libpq
 Version: 12.2
-Port-Version: 10
+Port-Version: 11
 Build-Depends: libpq[core,bonjour] (osx)
 Supports: !uwp
 Homepage: https://www.postgresql.org/
diff --git a/ports/libpq/portfile.cmake b/ports/libpq/portfile.cmake
index 91f6e36435c69b..427aed5b118277 100644
--- a/ports/libpq/portfile.cmake
+++ b/ports/libpq/portfile.cmake
@@ -297,8 +297,8 @@ else()
     if(NOT HAS_TOOLS)
         file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin)
     else()
-        file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools/${PORT})
-        file(RENAME ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/tools/${PORT})
+        vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin)
+        file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug)
     endif()
     set(USE_DL ON)
 endif()
diff --git a/versions/baseline.json b/versions/baseline.json
index f45c801d233d49..5356e880f3fe39 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -3226,7 +3226,7 @@
     },
     "libpq": {
       "baseline": "12.2",
-      "port-version": 10
+      "port-version": 11
     },
     "libpqxx": {
       "baseline": "7.3.0",
diff --git a/versions/l-/libpq.json b/versions/l-/libpq.json
index fca613ba448455..a076337a1a6791 100644
--- a/versions/l-/libpq.json
+++ b/versions/l-/libpq.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "e09ebfc1a310be48ed9f5f3e6d2a648cfddff424",
+      "version-string": "12.2",
+      "port-version": 11
+    },
     {
       "git-tree": "7c4dbe4fcb780bed98e6b55ccf039b77c7a5be68",
       "version-string": "12.2",