diff --git a/ports/hdf5/libaec-config.diff b/ports/hdf5/libaec-config.diff
index b0107ea73b..52f0ad4f0f 100644
--- a/ports/hdf5/libaec-config.diff
+++ b/ports/hdf5/libaec-config.diff
@@ -1,8 +1,8 @@
 diff --git a/CMakeFilters.cmake b/CMakeFilters.cmake
-index 548a306..680ab84 100644
+index 6b75ff6..1be154e 100644
 --- a/CMakeFilters.cmake
 +++ b/CMakeFilters.cmake
-@@ -211,12 +211,6 @@ endif ()
+@@ -202,12 +202,6 @@ endif ()
  if (HDF5_ENABLE_SZIP_SUPPORT)
    cmake_dependent_option (HDF5_ENABLE_SZIP_ENCODING "Use SZip Encoding" ON HDF5_ENABLE_SZIP_SUPPORT OFF)
    if (NOT SZIP_USE_EXTERNAL) # This checks if szip should be found on the system or built from an external source
@@ -13,18 +13,18 @@ index 548a306..680ab84 100644
 -    endif ()
 -    set (libaec_USE_STATIC_LIBS ${HDF5_USE_LIBAEC_STATIC})
      set (SZIP_FOUND FALSE)
-     # Search pure Config mode, there is not a FindSZIP module available
-     find_package (${LIBAEC_PACKAGE_NAME} NAMES ${LIBAEC_PACKAGE_NAME}${HDF_PACKAGE_EXT} OPTIONAL_COMPONENTS ${LIBAEC_SEARCH_TYPE})
+     find_package (${LIBAEC_PACKAGE_NAME} OPTIONAL_COMPONENTS ${LIBAEC_SEARCH_TYPE})
+     set (H5_SZIP_FOUND ${${LIBAEC_PACKAGE_NAME}_FOUND})
 diff --git a/config/install/hdf5-config.cmake.in b/config/install/hdf5-config.cmake.in
-index 6b82510..d1bc1b6 100644
+index bb9a8d6..a73bec8 100644
 --- a/config/install/hdf5-config.cmake.in
 +++ b/config/install/hdf5-config.cmake.in
-@@ -133,7 +133,7 @@ endif ()
+@@ -137,7 +137,7 @@ endif ()
  
  if (${HDF5_PACKAGE_NAME}_PROVIDES_SZIP_SUPPORT)
    if (NOT @SZIP_USE_EXTERNAL@)
--    find_package (LIBAEC NAMES @LIBAEC_PACKAGE_NAME@ CONFIG OPTIONAL_COMPONENTS @LIBAEC_SEARCH_TYPE@)
-+    find_package (@LIBAEC_PACKAGE_NAME@ CONFIG)
+-    find_dependency (@LIBAEC_PACKAGE_NAME@ OPTIONAL_COMPONENTS @LIBAEC_SEARCH_TYPE@)
++    find_dependency (@LIBAEC_PACKAGE_NAME@ CONFIG)
    endif ()
  endif ()
  
diff --git a/ports/hdf5/pkgconfig.patch b/ports/hdf5/pkgconfig.patch
deleted file mode 100644
index 9a5b5ecef9..0000000000
--- a/ports/hdf5/pkgconfig.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-diff --git a/CMakeFilters.cmake b/CMakeFilters.cmake
-index b276769..548a306 100644
---- a/CMakeFilters.cmake
-+++ b/CMakeFilters.cmake
-@@ -161,7 +161,7 @@ if (HDF5_ENABLE_ZLIB_SUPPORT)
-         endif ()
-         set (H5_ZLIB_INCLUDE_DIR_GEN ${ZLIB_INCLUDE_DIR})
-         set (H5_ZLIB_INCLUDE_DIRS ${H5_ZLIB_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIR})
--        if (NOT WIN32) #windows has a list of names
-+        if (0)
-           # The FindZLIB.cmake module does not set an OUTPUT_NAME
-           # on the target. The target returned is: ZLIB::ZLIB
-           get_filename_component (libname ${ZLIB_LIBRARIES} NAME_WLE)
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index bbdf92a..c36d5c2 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -1450,9 +1450,26 @@ foreach (lib ${LINK_LIBS})
-   endif ()
- endforeach ()
- 
-+if(UNIX AND H5_HAVE_PARALLEL)
-+    foreach(_lib IN LISTS ${MPI_C_LIBRARIES})
-+        string(REPLACE " -l${_lib} " " " _PKG_CONFIG_LIBS_PRIVATE " ${_PKG_CONFIG_LIBS_PRIVATE} ")
-+    endforeach()
-+    string(APPEND _PKG_CONFIG_REQUIRES_PRIVATE " ompi-c")
-+endif()
-+
- # The settings for the compression libs depends on if they have pkconfig support
- # Assuming they don't
- foreach (libs ${LINK_COMP_LIBS})
-+  if(libs STREQUAL ZLIB::ZLIB)
-+    string(APPEND _PKG_CONFIG_REQUIRES_PRIVATE " zlib")
-+    continue()
-+  elseif(libs STREQUAL "libaec::sz")
-+    string(APPEND _PKG_CONFIG_LIBS_PRIVATE " ${libaec_LIBRARY}")
-+    continue()
-+  elseif(libs STREQUAL "libaec::aec")
-+    string(APPEND _PKG_CONFIG_LIBS_PRIVATE " ${SZIP_LIBRARY}")
-+    continue()
-+  endif()
-   get_target_property (libname ${libs} OUTPUT_NAME)
-   set (_PKG_CONFIG_LIBS_PRIVATE "${_PKG_CONFIG_LIBS_PRIVATE} -l${libname}")
- endforeach ()
diff --git a/ports/hdf5/portfile.cmake b/ports/hdf5/portfile.cmake
index ef1a518868..e54779a8b1 100644
--- a/ports/hdf5/portfile.cmake
+++ b/ports/hdf5/portfile.cmake
@@ -1,17 +1,15 @@
 # highfive should be updated together with hdf5
 
-string(REPLACE "." "." hdf5_ref "hdf5_${VERSION}")
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO  HDFGroup/hdf5
-    REF "${hdf5_ref}"
-    SHA512 609e129f78c6777a0e64694de8ec638326a616ff9cbd916f310dc6f78435ef67194c5ab59faedda09c85c045c15ebe2ec4ce04fa905d5f74801600e067c27fcc
+    REF "${VERSION}"
+    SHA512 45844e2f0e89b5a0291c9fecd9b4b663eed1a7a21b38e358fd6f6198fe509c19bcf91651d1ae3b4cf8de7445f7a71854acdb1635b939b6d08fdaf6b6c0e396d1
     HEAD_REF develop
     PATCHES
         default-plugin-dir.diff # avoid absolute path
         libaec-config.diff
         mpi-flags.diff
-        pkgconfig.patch
         win-compile-flags.diff
 )
 
diff --git a/ports/hdf5/vcpkg.json b/ports/hdf5/vcpkg.json
index 6ed45c2807..4464de7749 100644
--- a/ports/hdf5/vcpkg.json
+++ b/ports/hdf5/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "hdf5",
-  "version": "2.0.0",
-  "port-version": 1,
+  "version": "2.1.1",
   "description": "HDF5 is a data model, library, and file format for storing and managing data",
   "homepage": "https://www.hdfgroup.org/downloads/hdf5/",
   "license": "BSD-3-Clause",
diff --git a/versions/baseline.json b/versions/baseline.json
index 3d3bbe24e4..8199650121 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -3745,8 +3745,8 @@
       "port-version": 0
     },
     "hdf5": {
-      "baseline": "2.0.0",
-      "port-version": 1
+      "baseline": "2.1.1",
+      "port-version": 0
     },
     "hdr-histogram": {
       "baseline": "0.11.9",
diff --git a/versions/h-/hdf5.json b/versions/h-/hdf5.json
index 3bbd00cd85..242e9d74c3 100644
--- a/versions/h-/hdf5.json
+++ b/versions/h-/hdf5.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "0e7142ee89b78b29491b81ab810064e26c41c036",
+      "version": "2.1.1",
+      "port-version": 0
+    },
     {
       "git-tree": "7745308c392fe463be2cdedf415536c45bb297f2",
       "version": "2.0.0",