diff --git a/ports/openjpeg/pkgconfig.diff b/ports/openjpeg/pkgconfig.diff
new file mode 100644
index 0000000000..6fb3b0caa4
--- /dev/null
+++ b/ports/openjpeg/pkgconfig.diff
@@ -0,0 +1,23 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 29a89939..5c5f4e5c 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -332,10 +332,14 @@ set_variable_from_rel_or_absolute_path("includedir" "\\\${prefix}" "${CMAKE_INST
+ function(get_pkgconfig_deps NAME OUT)
+   get_target_property(link_libs ${NAME} LINK_LIBRARIES)
+   if(NOT link_libs STREQUAL "link_libs-NOTFOUND")
+-    foreach(lib ${link_libs})
+-      # omit -lopenjp2 from Libs.private because libopenjp2 is in Requires
+-      if(NOT ${lib} STREQUAL ${OPENJPEG_LIBRARY_NAME})
+-        string(APPEND deps "-l${lib} ")
++    # omit openjp2 from Libs.private because libopenjp2 is in Requires
++    list(REMOVE_ITEM link_libs "${OPENJPEG_LIBRARY_NAME}")
++    set(deps "")
++    foreach(item IN LISTS link_libs)
++      if(item STREQUAL "-pthread" OR item STREQUAL "-lpthread")
++        string(APPEND deps " ${item}")
++      else()
++        string(APPEND deps " -l${item}")
+       endif()
+     endforeach()
+   endif()
diff --git a/ports/openjpeg/portfile.cmake b/ports/openjpeg/portfile.cmake
index b67617e60f..c09bf7ec1e 100644
--- a/ports/openjpeg/portfile.cmake
+++ b/ports/openjpeg/portfile.cmake
@@ -2,9 +2,10 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO uclouvain/openjpeg
     REF "v${VERSION}"
-    SHA512 22378f5c38c1eb8ade853716897201d8a253024638bdf94fd9851d6a456601071e705c797c5ffeeb6924be14d7356f9a67f15c2b99e96f7d27fc375a9d94505a
+    SHA512 702a10e20caaf8209684ded7c9fcf32f5ba6a972cf2d9fcf2611cdc6a446d2c3bb60324205758e6b6f92278c8cf4ef0fbae511e6ffb45ed6e8df514db0c6ab25
     HEAD_REF master
     PATCHES
+        pkgconfig.diff
         third-party.diff
 )
 
@@ -42,18 +43,6 @@ vcpkg_copy_pdbs()
 vcpkg_cmake_config_fixup()
 vcpkg_fixup_pkgconfig()
 
-if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)
-    if(NOT VCPKG_BUILD_TYPE)
-        vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libopenjp2.pc" "-lm" "")
-    endif()
-    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libopenjp2.pc" "-lm" "")
-else()
-    if(NOT VCPKG_BUILD_TYPE)
-        vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libopenjp2.pc" "-lm" "-lm -pthread")
-    endif()
-    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libopenjp2.pc" "-lm" "-lm -pthread")
-endif()
-
 set(TOOL_NAMES "")
 if("tools" IN_LIST FEATURES)
     list(APPEND TOOL_NAMES opj_compress opj_decompress opj_dump opj_dec_server opj_jpip_addxml opj_jpip_test opj_jpip_transcode)
diff --git a/ports/openjpeg/vcpkg.json b/ports/openjpeg/vcpkg.json
index 018b4fbffb..09dac1337e 100644
--- a/ports/openjpeg/vcpkg.json
+++ b/ports/openjpeg/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "openjpeg",
-  "version": "2.5.3",
+  "version": "2.5.4",
   "description": "OpenJPEG is an open-source JPEG 2000 codec written in C language. It has been developed in order to promote the use of JPEG 2000, a still-image compression standard from the Joint Photographic Experts Group (JPEG). Since April 2015, it is officially recognized by ISO/IEC and ITU-T as a JPEG 2000 Reference Software.",
   "homepage": "https://github.com/uclouvain/openjpeg",
   "license": "BSD-2-Clause",
diff --git a/versions/baseline.json b/versions/baseline.json
index 9dcd14d9ca..4d4dc76daa 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -7093,7 +7093,7 @@
       "port-version": 1
     },
     "openjpeg": {
-      "baseline": "2.5.3",
+      "baseline": "2.5.4",
       "port-version": 0
     },
     "openldap": {
diff --git a/versions/o-/openjpeg.json b/versions/o-/openjpeg.json
index 2588101430..8d5c9ea37c 100644
--- a/versions/o-/openjpeg.json
+++ b/versions/o-/openjpeg.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "e95aa6d786ed44b493017c574ac8e1b84ac65ffd",
+      "version": "2.5.4",
+      "port-version": 0
+    },
     {
       "git-tree": "61c643a75c48577ade1b0bc24d3a292b23ee3afd",
       "version": "2.5.3",