diff --git a/ports/gmsh/fix-install.patch b/ports/gmsh/fix-install.patch
index 2f45102407..3d37dcb582 100644
--- a/ports/gmsh/fix-install.patch
+++ b/ports/gmsh/fix-install.patch
@@ -1,8 +1,8 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 7040709..a4b8c61 100644
+index 2e65c4f..50bea50 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -1872,12 +1872,30 @@ endif()
+@@ -1947,13 +1947,37 @@ endif()
  
  # mark targets as optional so we can install them separately if needed
  # (e.g. "make lib" or "make shared" followed by "make install/fast")
@@ -10,29 +10,37 @@ index 7040709..a4b8c61 100644
 +install(
 +  TARGETS gmsh
 +  RUNTIME DESTINATION bin
-+  LIBRARY DESTINATION lib
-+  ARCHIVE DESTINATION lib
 +  OPTIONAL
 +)
  if(ENABLE_BUILD_LIB)
 -  install(TARGETS lib DESTINATION ${GMSH_LIB} OPTIONAL)
 +  install(
 +    TARGETS lib
-+    RUNTIME DESTINATION bin
++    EXPORT unofficial-gmsh-config
 +    LIBRARY DESTINATION lib
 +    ARCHIVE DESTINATION lib
 +    OPTIONAL
 +  )
++  TARGET_INCLUDE_DIRECTORIES(lib PUBLIC $<INSTALL_INTERFACE:include>)
  endif()
  if(ENABLE_BUILD_SHARED OR ENABLE_BUILD_DYNAMIC)
 -  install(TARGETS shared DESTINATION ${GMSH_LIB} OPTIONAL)
+-endif()
 +  install(
 +    TARGETS shared
++    EXPORT unofficial-gmsh-config
 +    RUNTIME DESTINATION bin
 +    LIBRARY DESTINATION lib
 +    ARCHIVE DESTINATION lib
 +    OPTIONAL
 +  )
- endif()
++  TARGET_INCLUDE_DIRECTORIES(shared PUBLIC $<INSTALL_INTERFACE:include>)
++endif()
++install(
++  EXPORT unofficial-gmsh-config
++  NAMESPACE unofficial::gmsh:: 
++  DESTINATION share/unofficial-gmsh
++)
  
  if(ENABLE_ONELAB AND EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/contrib/onelab)
+   install(FILES ${ONELAB_PY} DESTINATION ${GMSH_BIN})
diff --git a/ports/gmsh/portfile.cmake b/ports/gmsh/portfile.cmake
index 303eae12ee..0aae8b2a98 100644
--- a/ports/gmsh/portfile.cmake
+++ b/ports/gmsh/portfile.cmake
@@ -108,6 +108,8 @@ vcpkg_cmake_install()
 
 vcpkg_copy_tools(TOOL_NAMES gmsh AUTO_CLEAN)
 
+vcpkg_cmake_config_fixup(PACKAGE_NAME "unofficial-gmsh")
+
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share")
 
 vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt")
diff --git a/ports/gmsh/vcpkg.json b/ports/gmsh/vcpkg.json
index 7839de5264..4eee1e7fb9 100644
--- a/ports/gmsh/vcpkg.json
+++ b/ports/gmsh/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "gmsh",
   "version": "4.12.2",
+  "port-version": 1,
   "description": "Gmsh is an open source 3D finite element mesh generator with a built-in CAD engine and post-processor.",
   "homepage": "https://gmsh.info",
   "license": "LGPL-2.0-or-later",
@@ -10,6 +11,10 @@
     {
       "name": "vcpkg-cmake",
       "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
     }
   ],
   "features": {
diff --git a/versions/baseline.json b/versions/baseline.json
index ad3306730c..a4324ebc93 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -3166,7 +3166,7 @@
     },
     "gmsh": {
       "baseline": "4.12.2",
-      "port-version": 0
+      "port-version": 1
     },
     "gobject-introspection": {
       "baseline": "1.72.0",
diff --git a/versions/g-/gmsh.json b/versions/g-/gmsh.json
index 5ff068def0..2e5ccfda15 100644
--- a/versions/g-/gmsh.json
+++ b/versions/g-/gmsh.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "b32cf3fd3185169073c2aa58a2758fa7fe153808",
+      "version": "4.12.2",
+      "port-version": 1
+    },
     {
       "git-tree": "d97f6df221dfe46e532d3f9d27c4dbd3bbdac0ea",
       "version": "4.12.2",