diff --git a/.ci_support/linux_64_mpimpich.yaml b/.ci_support/linux_64_mpimpich.yaml
index fd276319..d2f57caa 100644
--- a/.ci_support/linux_64_mpimpich.yaml
+++ b/.ci_support/linux_64_mpimpich.yaml
@@ -10,8 +10,6 @@ channel_sources:
 - conda-forge
 channel_targets:
 - conda-forge main
-curl:
-- '8'
 cxx_compiler:
 - gxx
 cxx_compiler_version:
@@ -22,8 +20,10 @@ hdf4:
 - 4.2.15
 hdf5:
 - 1.14.1
-libjpeg_turbo:
-- 2.1.5
+libaec:
+- '1'
+libcurl:
+- '8'
 libxml2:
 - '2.11'
 libzip:
diff --git a/.ci_support/linux_64_mpinompi.yaml b/.ci_support/linux_64_mpinompi.yaml
index 200d0892..8bfc880d 100644
--- a/.ci_support/linux_64_mpinompi.yaml
+++ b/.ci_support/linux_64_mpinompi.yaml
@@ -10,8 +10,6 @@ channel_sources:
 - conda-forge
 channel_targets:
 - conda-forge main
-curl:
-- '8'
 cxx_compiler:
 - gxx
 cxx_compiler_version:
@@ -22,8 +20,10 @@ hdf4:
 - 4.2.15
 hdf5:
 - 1.14.1
-libjpeg_turbo:
-- 2.1.5
+libaec:
+- '1'
+libcurl:
+- '8'
 libxml2:
 - '2.11'
 libzip:
diff --git a/.ci_support/linux_64_mpiopenmpi.yaml b/.ci_support/linux_64_mpiopenmpi.yaml
index e139da3b..00cfae9b 100644
--- a/.ci_support/linux_64_mpiopenmpi.yaml
+++ b/.ci_support/linux_64_mpiopenmpi.yaml
@@ -10,8 +10,6 @@ channel_sources:
 - conda-forge
 channel_targets:
 - conda-forge main
-curl:
-- '8'
 cxx_compiler:
 - gxx
 cxx_compiler_version:
@@ -22,8 +20,10 @@ hdf4:
 - 4.2.15
 hdf5:
 - 1.14.1
-libjpeg_turbo:
-- 2.1.5
+libaec:
+- '1'
+libcurl:
+- '8'
 libxml2:
 - '2.11'
 libzip:
diff --git a/.ci_support/linux_aarch64_mpimpich.yaml b/.ci_support/linux_aarch64_mpimpich.yaml
index 94c24a67..c7372b7b 100644
--- a/.ci_support/linux_aarch64_mpimpich.yaml
+++ b/.ci_support/linux_aarch64_mpimpich.yaml
@@ -14,8 +14,6 @@ channel_sources:
 - conda-forge
 channel_targets:
 - conda-forge main
-curl:
-- '8'
 cxx_compiler:
 - gxx
 cxx_compiler_version:
@@ -26,8 +24,10 @@ hdf4:
 - 4.2.15
 hdf5:
 - 1.14.1
-libjpeg_turbo:
-- 2.1.5
+libaec:
+- '1'
+libcurl:
+- '8'
 libxml2:
 - '2.11'
 libzip:
diff --git a/.ci_support/linux_aarch64_mpinompi.yaml b/.ci_support/linux_aarch64_mpinompi.yaml
index d6fa94e0..6ce9151b 100644
--- a/.ci_support/linux_aarch64_mpinompi.yaml
+++ b/.ci_support/linux_aarch64_mpinompi.yaml
@@ -14,8 +14,6 @@ channel_sources:
 - conda-forge
 channel_targets:
 - conda-forge main
-curl:
-- '8'
 cxx_compiler:
 - gxx
 cxx_compiler_version:
@@ -26,8 +24,10 @@ hdf4:
 - 4.2.15
 hdf5:
 - 1.14.1
-libjpeg_turbo:
-- 2.1.5
+libaec:
+- '1'
+libcurl:
+- '8'
 libxml2:
 - '2.11'
 libzip:
diff --git a/.ci_support/linux_aarch64_mpiopenmpi.yaml b/.ci_support/linux_aarch64_mpiopenmpi.yaml
index 132cc607..ee8c0cb1 100644
--- a/.ci_support/linux_aarch64_mpiopenmpi.yaml
+++ b/.ci_support/linux_aarch64_mpiopenmpi.yaml
@@ -14,8 +14,6 @@ channel_sources:
 - conda-forge
 channel_targets:
 - conda-forge main
-curl:
-- '8'
 cxx_compiler:
 - gxx
 cxx_compiler_version:
@@ -26,8 +24,10 @@ hdf4:
 - 4.2.15
 hdf5:
 - 1.14.1
-libjpeg_turbo:
-- 2.1.5
+libaec:
+- '1'
+libcurl:
+- '8'
 libxml2:
 - '2.11'
 libzip:
diff --git a/.ci_support/linux_ppc64le_mpimpich.yaml b/.ci_support/linux_ppc64le_mpimpich.yaml
index 10625b1d..2fe2edd8 100644
--- a/.ci_support/linux_ppc64le_mpimpich.yaml
+++ b/.ci_support/linux_ppc64le_mpimpich.yaml
@@ -10,8 +10,6 @@ channel_sources:
 - conda-forge
 channel_targets:
 - conda-forge main
-curl:
-- '8'
 cxx_compiler:
 - gxx
 cxx_compiler_version:
@@ -22,8 +20,10 @@ hdf4:
 - 4.2.15
 hdf5:
 - 1.14.1
-libjpeg_turbo:
-- 2.1.5
+libaec:
+- '1'
+libcurl:
+- '8'
 libxml2:
 - '2.11'
 libzip:
diff --git a/.ci_support/linux_ppc64le_mpinompi.yaml b/.ci_support/linux_ppc64le_mpinompi.yaml
index 7326f626..fe402851 100644
--- a/.ci_support/linux_ppc64le_mpinompi.yaml
+++ b/.ci_support/linux_ppc64le_mpinompi.yaml
@@ -10,8 +10,6 @@ channel_sources:
 - conda-forge
 channel_targets:
 - conda-forge main
-curl:
-- '8'
 cxx_compiler:
 - gxx
 cxx_compiler_version:
@@ -22,8 +20,10 @@ hdf4:
 - 4.2.15
 hdf5:
 - 1.14.1
-libjpeg_turbo:
-- 2.1.5
+libaec:
+- '1'
+libcurl:
+- '8'
 libxml2:
 - '2.11'
 libzip:
diff --git a/.ci_support/linux_ppc64le_mpiopenmpi.yaml b/.ci_support/linux_ppc64le_mpiopenmpi.yaml
index 55b0be9e..4a14752a 100644
--- a/.ci_support/linux_ppc64le_mpiopenmpi.yaml
+++ b/.ci_support/linux_ppc64le_mpiopenmpi.yaml
@@ -10,8 +10,6 @@ channel_sources:
 - conda-forge
 channel_targets:
 - conda-forge main
-curl:
-- '8'
 cxx_compiler:
 - gxx
 cxx_compiler_version:
@@ -22,8 +20,10 @@ hdf4:
 - 4.2.15
 hdf5:
 - 1.14.1
-libjpeg_turbo:
-- 2.1.5
+libaec:
+- '1'
+libcurl:
+- '8'
 libxml2:
 - '2.11'
 libzip:
diff --git a/.ci_support/osx_64_mpimpich.yaml b/.ci_support/osx_64_mpimpich.yaml
index 51cffcc6..cda526f1 100644
--- a/.ci_support/osx_64_mpimpich.yaml
+++ b/.ci_support/osx_64_mpimpich.yaml
@@ -10,8 +10,6 @@ channel_sources:
 - conda-forge
 channel_targets:
 - conda-forge main
-curl:
-- '8'
 cxx_compiler:
 - clangxx
 cxx_compiler_version:
@@ -20,8 +18,10 @@ hdf4:
 - 4.2.15
 hdf5:
 - 1.14.1
-libjpeg_turbo:
-- 2.1.5
+libaec:
+- '1'
+libcurl:
+- '8'
 libxml2:
 - '2.11'
 libzip:
diff --git a/.ci_support/osx_64_mpinompi.yaml b/.ci_support/osx_64_mpinompi.yaml
index 328fec2e..639522f0 100644
--- a/.ci_support/osx_64_mpinompi.yaml
+++ b/.ci_support/osx_64_mpinompi.yaml
@@ -10,8 +10,6 @@ channel_sources:
 - conda-forge
 channel_targets:
 - conda-forge main
-curl:
-- '8'
 cxx_compiler:
 - clangxx
 cxx_compiler_version:
@@ -20,8 +18,10 @@ hdf4:
 - 4.2.15
 hdf5:
 - 1.14.1
-libjpeg_turbo:
-- 2.1.5
+libaec:
+- '1'
+libcurl:
+- '8'
 libxml2:
 - '2.11'
 libzip:
diff --git a/.ci_support/osx_64_mpiopenmpi.yaml b/.ci_support/osx_64_mpiopenmpi.yaml
index 2195811c..4b5ddc3a 100644
--- a/.ci_support/osx_64_mpiopenmpi.yaml
+++ b/.ci_support/osx_64_mpiopenmpi.yaml
@@ -10,8 +10,6 @@ channel_sources:
 - conda-forge
 channel_targets:
 - conda-forge main
-curl:
-- '8'
 cxx_compiler:
 - clangxx
 cxx_compiler_version:
@@ -20,8 +18,10 @@ hdf4:
 - 4.2.15
 hdf5:
 - 1.14.1
-libjpeg_turbo:
-- 2.1.5
+libaec:
+- '1'
+libcurl:
+- '8'
 libxml2:
 - '2.11'
 libzip:
diff --git a/.ci_support/osx_arm64_mpimpich.yaml b/.ci_support/osx_arm64_mpimpich.yaml
index 01819726..b669906f 100644
--- a/.ci_support/osx_arm64_mpimpich.yaml
+++ b/.ci_support/osx_arm64_mpimpich.yaml
@@ -10,8 +10,6 @@ channel_sources:
 - conda-forge
 channel_targets:
 - conda-forge main
-curl:
-- '8'
 cxx_compiler:
 - clangxx
 cxx_compiler_version:
@@ -20,8 +18,10 @@ hdf4:
 - 4.2.15
 hdf5:
 - 1.14.1
-libjpeg_turbo:
-- 2.1.5
+libaec:
+- '1'
+libcurl:
+- '8'
 libxml2:
 - '2.11'
 libzip:
diff --git a/.ci_support/osx_arm64_mpinompi.yaml b/.ci_support/osx_arm64_mpinompi.yaml
index d3f8517b..61818791 100644
--- a/.ci_support/osx_arm64_mpinompi.yaml
+++ b/.ci_support/osx_arm64_mpinompi.yaml
@@ -10,8 +10,6 @@ channel_sources:
 - conda-forge
 channel_targets:
 - conda-forge main
-curl:
-- '8'
 cxx_compiler:
 - clangxx
 cxx_compiler_version:
@@ -20,8 +18,10 @@ hdf4:
 - 4.2.15
 hdf5:
 - 1.14.1
-libjpeg_turbo:
-- 2.1.5
+libaec:
+- '1'
+libcurl:
+- '8'
 libxml2:
 - '2.11'
 libzip:
diff --git a/.ci_support/osx_arm64_mpiopenmpi.yaml b/.ci_support/osx_arm64_mpiopenmpi.yaml
index 11044adc..eb788b99 100644
--- a/.ci_support/osx_arm64_mpiopenmpi.yaml
+++ b/.ci_support/osx_arm64_mpiopenmpi.yaml
@@ -10,8 +10,6 @@ channel_sources:
 - conda-forge
 channel_targets:
 - conda-forge main
-curl:
-- '8'
 cxx_compiler:
 - clangxx
 cxx_compiler_version:
@@ -20,8 +18,10 @@ hdf4:
 - 4.2.15
 hdf5:
 - 1.14.1
-libjpeg_turbo:
-- 2.1.5
+libaec:
+- '1'
+libcurl:
+- '8'
 libxml2:
 - '2.11'
 libzip:
diff --git a/.ci_support/win_64_.yaml b/.ci_support/win_64_.yaml
index e6f71ae0..0b3691c1 100644
--- a/.ci_support/win_64_.yaml
+++ b/.ci_support/win_64_.yaml
@@ -6,16 +6,16 @@ channel_sources:
 - conda-forge
 channel_targets:
 - conda-forge main
-curl:
-- '8'
 cxx_compiler:
 - vs2019
 hdf4:
 - 4.2.15
 hdf5:
 - 1.14.1
-libjpeg_turbo:
-- 2.1.5
+libaec:
+- '1'
+libcurl:
+- '8'
 libxml2:
 - '2.11'
 libzip:
diff --git a/recipe/bld.bat b/recipe/bld.bat
index f3f0ca8c..c4009bd5 100644
--- a/recipe/bld.bat
+++ b/recipe/bld.bat
@@ -5,25 +5,37 @@ set BUILD_TYPE=Release
 :: set BUILD_TYPE=RelWithDebInfo
 :: set BUILD_TYPE=Debug
 
+rem to be filled with mpi options
+set PARALLEL=""
+
 rem manually specify hdf5 paths to work-around https://github.com/Unidata/netcdf-c/issues/1444
 cmake -LAH -G "NMake Makefiles" ^
+      %CMAKE_ARGS% ^
       -DCMAKE_INSTALL_PREFIX="%LIBRARY_PREFIX%" ^
+      -DCMAKE_PREFIX_PATH="%LIBRARY_PREFIX%" ^
+      -DCMAKE_BUILD_TYPE=%BUILD_TYPE% ^
       -DBUILD_SHARED_LIBS=ON ^
-      -DPLUGIN_INSTALL_DIR=YES ^
+      -DBUILD_UTILITIES=ON ^
+      -DENABLE_DOXYGEN=OFF ^
       -DENABLE_TESTS=ON ^
+      -DENABLE_EXTERNAL_SERVER_TESTS=OFF ^
+      -DENABLE_DAP=ON ^
+      -DENABLE_DAP_REMOTE_TESTS=OFF ^
       -DENABLE_HDF4=ON ^
-      -DCMAKE_PREFIX_PATH="%LIBRARY_PREFIX%" ^
-      -DCMAKE_BUILD_TYPE=%BUILD_TYPE% ^
+      -DENABLE_NETCDF_4=ON ^
+      -DENABLE_PLUGIN_INSTALL=ON ^
+      -DPLUGIN_INSTALL_DIR=YES ^
       -DENABLE_CDF5=ON ^
       -DENABLE_BYTERANGE=ON ^
+      -DENABLE_NCZARR=on ^
+      -DENABLE_NCZARR_ZIP=on ^
+      -DENABLE_NCZARR_S3=off ^
+      -DENABLE_NCZARR_S3_TESTS=off ^
       -DHDF5_C_LIBRARY="%LIBRARY_LIB:\=/%/hdf5.lib" ^
       -DHDF5_HL_LIBRARY="%LIBRARY_LIB:\=/%/hdf5_hl.lib" ^
       -DHDF5_INCLUDE_DIR="%LIBRARY_INC:\=/%" ^
       -DCMAKE_C_FLAGS="-DH5_BUILT_AS_DYNAMIC_LIB" ^
-      -DENABLE_NCZARR=on ^
-      -DENABLE_NCZARR_S3=off ^
-      -DENABLE_NCZARR_S3_TESTS=off ^
-      -DENABLE_EXTERNAL_SERVER_TESTS=OFF ^
+      %PARALLEL% ^
       %SRC_DIR%
 if errorlevel 1 exit \b 1
 
diff --git a/recipe/build.sh b/recipe/build.sh
index d8dd562b..05316ee2 100644
--- a/recipe/build.sh
+++ b/recipe/build.sh
@@ -65,22 +65,24 @@ cd build-shared
 cmake ${CMAKE_ARGS} \
       -DCMAKE_PREFIX_PATH=${PREFIX} \
       -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} \
+      -DBUILD_SHARED_LIBS=ON \
+      -DBUILD_UTILITIES=ON \
+      -DENABLE_DOXYGEN=OFF \
+      -DENABLE_TESTS=ON \
+      -DENABLE_EXTERNAL_SERVER_TESTS=OFF \
       -DENABLE_DAP=ON \
       -DENABLE_DAP_REMOTE_TESTS=OFF \
       -DENABLE_HDF4=ON \
       -DENABLE_NETCDF_4=ON \
-      -DBUILD_SHARED_LIBS=ON \
       -DENABLE_PLUGIN_INSTALL=ON \
       -DPLUGIN_INSTALL_DIR=${HDF5_PLUGIN_PATH} \
-      -DENABLE_TESTS=ON \
-      -DBUILD_UTILITIES=ON \
-      -DENABLE_DOXYGEN=OFF \
       -DENABLE_CDF5=ON \
-      -DENABLE_EXTERNAL_SERVER_TESTS=OFF \
-      ${PARALLEL} \
+      -DENABLE_BYTERANGE=ON \
       -DENABLE_NCZARR=on \
+      -DENABLE_NCZARR_ZIP=on \
       -DENABLE_NCZARR_S3=off \
       -DENABLE_NCZARR_S3_TESTS=off \
+      ${PARALLEL} \
       ${SRC_DIR}
 make install -j${CPU_COUNT} ${VERBOSE_CM}
 
diff --git a/recipe/meta.yaml b/recipe/meta.yaml
index 2ada41c2..632a0cea 100644
--- a/recipe/meta.yaml
+++ b/recipe/meta.yaml
@@ -1,5 +1,5 @@
 {% set version = "4.9.2" %}
-{% set build = 6 %}
+{% set build = 7 %}
 
 # recipe-lint fails if mpi is undefined
 {% set mpi = mpi or 'nompi' %}
@@ -21,6 +21,7 @@ source:
     - patches/prevent_MS_runtime_libs_being_installed_again.patch  # [win]
     - patches/do_not_use_16_processes_in_tests.patch  # [ppc64le]
     - patches/0001-Fix-issue-2674.patch
+    - patches/0001-Switch-custom-Bzip2-cmake-module-to-standard.patch
 
 build:
   number: {{ build }}
@@ -67,23 +68,21 @@ requirements:
     - m2-m4  # [win]
   host:
     - {{ mpi }}  # [mpi != 'nompi']
-    - msinttypes  # [win and vc<14]
+    - blosc
     - bzip2
-    - curl
-    - zlib
     - hdf4
     # without this repeat reference, conda-smithy doesn't pin correctly
     - hdf5
     - hdf5 * {{ mpi_prefix }}_*
-    - libjpeg-turbo
+    - libaec
+    - libcurl
+    - libxml2
     - libzip
+    # Openssl provides libcrypto which is needed via libcurl, but doesn't get
+    # to the run reqs through run_exports because it is twice removed
+    - openssl  # [unix]
+    - zlib
     - zstd
-    - libxml2
-    - blosc
-  run:
-    - {{ mpi }}  # [mpi != 'nompi']
-    - curl
-    - hdf5 * {{ mpi_prefix }}_*
 
 test:
   commands:
diff --git a/recipe/patches/0001-Switch-custom-Bzip2-cmake-module-to-standard.patch b/recipe/patches/0001-Switch-custom-Bzip2-cmake-module-to-standard.patch
new file mode 100644
index 00000000..f2a0268e
--- /dev/null
+++ b/recipe/patches/0001-Switch-custom-Bzip2-cmake-module-to-standard.patch
@@ -0,0 +1,244 @@
+From b38811cf38f9e8a62f6675ef17280eb938e59c89 Mon Sep 17 00:00:00 2001
+From: Klaus Zimmermann <klaus.zimmermann@smhi.se>
+Date: Wed, 5 Jul 2023 10:45:08 +0200
+Subject: [PATCH] Switch custom Bzip2 cmake module to standard
+
+---
+ CMakeLists.txt                | 15 ++++----
+ cmake/modules/FindBz2.cmake   | 64 -----------------------------------
+ cmake/modules/FindBzip2.cmake | 64 -----------------------------------
+ liblib/CMakeLists.txt         |  4 +--
+ plugins/CMakeLists.txt        |  6 ++--
+ 5 files changed, 13 insertions(+), 140 deletions(-)
+ delete mode 100644 cmake/modules/FindBz2.cmake
+ delete mode 100644 cmake/modules/FindBzip2.cmake
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index de95010c..4a912713 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1132,7 +1132,7 @@ endmacro(set_std_filter)
+ 
+ # Locate some compressors
+ FIND_PACKAGE(Szip)
+-FIND_PACKAGE(Bz2)
++FIND_PACKAGE(BZip2)
+ FIND_PACKAGE(Blosc)
+ FIND_PACKAGE(Zstd)
+ 
+@@ -1142,14 +1142,14 @@ set_std_filter(Szip)
+   SET(HAVE_SZ ${Szip_FOUND})
+ set_std_filter(Blosc)
+ set_std_filter(Zstd)
+-IF(Bz2_FOUND)
+-  set_std_filter(Bz2)
++IF(BZIP2_FOUND)
++  set_std_filter(BZIP2)
+ ELSE()
+   # The reason we use a local version is to support a more comples test case
+   MESSAGE("libbz2 not found using built-in version")
+-  SET(HAVE_LOCAL_BZ2 ON)
+-  SET(HAVE_BZ2 ON)
+-  set(STD_FILTERS "${STD_FILTERS} bz2")
++  SET(HAVE_LOCAL_BZIP2 ON)
++  SET(HAVE_BZIP2 ON)
++  set(STD_FILTERS "${STD_FILTERS} bzip2")
+ ENDIF()
+ 
+ # If user wants, then install selected plugins (default on)
+@@ -2565,7 +2565,8 @@ is_enabled(HAVE_SZ HAS_SZIP)
+ is_enabled(HAVE_SZ HAS_SZLIB_WRITE)
+ is_enabled(HAVE_ZSTD HAS_ZSTD)
+ is_enabled(HAVE_BLOSC HAS_BLOSC)
+-is_enabled(HAVE_BZ2 HAS_BZ2)
++is_enabled(HAVE_BZIP2 HAS_BZIP2)
++is_enabled(HAVE_BZIP2 HAS_BZ2)
+ 
+ 
+ # Generate file from template.
+diff --git a/cmake/modules/FindBz2.cmake b/cmake/modules/FindBz2.cmake
+deleted file mode 100644
+index 89d66e18..00000000
+--- a/cmake/modules/FindBz2.cmake
++++ /dev/null
+@@ -1,64 +0,0 @@
+-# Searches for an installation of the bz2 library. On success, it sets the following variables:
+-#
+-#   Bz2_FOUND              Set to true to indicate the bz2 library was found
+-#   Bz2_INCLUDE_DIRS       The directory containing the header file bz2/bz2.h
+-#   Bz2_LIBRARIES          The libraries needed to use the bz2 library
+-#
+-# To specify an additional directory to search, set Bz2_ROOT.
+-#
+-# Author: Siddhartha Chaudhuri, 2009
+-#
+-
+-# Look for the header, first in the user-specified location and then in the system locations
+-SET(Bz2_INCLUDE_DOC "The directory containing the header file bz2.h")
+-FIND_PATH(Bz2_INCLUDE_DIRS NAMES bz2.h bz2/bz2.h PATHS ${Bz2_ROOT} ${Bz2_ROOT}/include DOC ${Bz2_INCLUDE_DOC} NO_DEFAULT_PATH)
+-IF(NOT Bz2_INCLUDE_DIRS)  # now look in system locations
+-  FIND_PATH(Bz2_INCLUDE_DIRS NAMES bzlib.h DOC ${Bz2_INCLUDE_DOC})
+-ENDIF(NOT Bz2_INCLUDE_DIRS)
+-
+-SET(Bz2_FOUND FALSE)
+-
+-IF(Bz2_INCLUDE_DIRS)
+-  SET(Bz2_LIBRARY_DIRS ${Bz2_INCLUDE_DIRS})
+-
+-  IF("${Bz2_LIBRARY_DIRS}" MATCHES "/include$")
+-    # Strip off the trailing "/include" in the path.
+-    GET_FILENAME_COMPONENT(Bz2_LIBRARY_DIRS ${Bz2_LIBRARY_DIRS} PATH)
+-  ENDIF("${Bz2_LIBRARY_DIRS}" MATCHES "/include$")
+-
+-  IF(EXISTS "${Bz2_LIBRARY_DIRS}/lib")
+-    SET(Bz2_LIBRARY_DIRS ${Bz2_LIBRARY_DIRS}/lib)
+-  ENDIF(EXISTS "${Bz2_LIBRARY_DIRS}/lib")
+-
+-  # Find Bz2 libraries
+-  FIND_LIBRARY(Bz2_DEBUG_LIBRARY NAMES bz2d bz2_d libbz2d libbz2_d libbz2
+-               PATH_SUFFIXES Debug ${CMAKE_LIBRARY_ARCHITECTURE} ${CMAKE_LIBRARY_ARCHITECTURE}/Debug
+-               PATHS ${Bz2_LIBRARY_DIRS} NO_DEFAULT_PATH)
+-  FIND_LIBRARY(Bz2_RELEASE_LIBRARY NAMES bz2 libbz2
+-               PATH_SUFFIXES Release ${CMAKE_LIBRARY_ARCHITECTURE} ${CMAKE_LIBRARY_ARCHITECTURE}/Release
+-               PATHS ${Bz2_LIBRARY_DIRS} NO_DEFAULT_PATH)
+-
+-  SET(Bz2_LIBRARIES )
+-  IF(Bz2_DEBUG_LIBRARY AND Bz2_RELEASE_LIBRARY)
+-    SET(Bz2_LIBRARIES debug ${Bz2_DEBUG_LIBRARY} optimized ${Bz2_RELEASE_LIBRARY})
+-  ELSEIF(Bz2_DEBUG_LIBRARY)
+-    SET(Bz2_LIBRARIES ${Bz2_DEBUG_LIBRARY})
+-  ELSEIF(Bz2_RELEASE_LIBRARY)
+-    SET(Bz2_LIBRARIES ${Bz2_RELEASE_LIBRARY})
+-  ENDIF(Bz2_DEBUG_LIBRARY AND Bz2_RELEASE_LIBRARY)
+-
+-  IF(Bz2_LIBRARIES)
+-    SET(Bz2_FOUND TRUE)
+-  ENDIF(Bz2_LIBRARIES)
+-ENDIF(Bz2_INCLUDE_DIRS)
+-
+-IF(Bz2_FOUND)
+-#  IF(NOT Bz2_FIND_QUIETLY)
+-    MESSAGE(STATUS "Found Bz2: headers at ${Bz2_INCLUDE_DIRS}, libraries at ${Bz2_LIBRARY_DIRS}")
+-    MESSAGE(STATUS "	library is ${Bz2_LIBRARIES}")    
+-#  ENDIF(NOT Bz2_FIND_QUIETLY)
+-ELSE(Bz2_FOUND)
+-  IF(Bz2_FIND_REQUIRED)
+-    MESSAGE(FATAL_ERROR "Bz2 library not found")
+-  ENDIF(Bz2_FIND_REQUIRED)
+-ENDIF(Bz2_FOUND)
+diff --git a/cmake/modules/FindBzip2.cmake b/cmake/modules/FindBzip2.cmake
+deleted file mode 100644
+index 9b6c9471..00000000
+--- a/cmake/modules/FindBzip2.cmake
++++ /dev/null
+@@ -1,64 +0,0 @@
+-# Searches for an installation of the bzip2 library. On success, it sets the following variables:
+-#
+-#   Bzip2_FOUND              Set to true to indicate the bzip2 library was found
+-#   Bzip2_INCLUDE_DIRS       The directory containing the header file bzip2/bzip2.h
+-#   Bzip2_LIBRARIES          The libraries needed to use the bzip2 library
+-#
+-# To specify an additional directory to search, set Bzip2_ROOT.
+-#
+-# Author: Siddhartha Chaudhuri, 2009
+-#
+-
+-# Look for the header, first in the user-specified location and then in the system locations
+-SET(Bzip2_INCLUDE_DOC "The directory containing the header file bzip2.h")
+-FIND_PATH(Bzip2_INCLUDE_DIRS NAMES bzip2.h bzip2/bzip2.h PATHS ${Bzip2_ROOT} ${Bzip2_ROOT}/include DOC ${Bzip2_INCLUDE_DOC} NO_DEFAULT_PATH)
+-IF(NOT Bzip2_INCLUDE_DIRS)  # now look in system locations
+-  FIND_PATH(Bzip2_INCLUDE_DIRS NAMES bzlib.h DOC ${Bzip2_INCLUDE_DOC})
+-ENDIF(NOT Bzip2_INCLUDE_DIRS)
+-
+-SET(Bzip2_FOUND FALSE)
+-
+-IF(Bzip2_INCLUDE_DIRS)
+-  SET(Bzip2_LIBRARY_DIRS ${Bzip2_INCLUDE_DIRS})
+-
+-  IF("${Bzip2_LIBRARY_DIRS}" MATCHES "/include$")
+-    # Strip off the trailing "/include" in the path.
+-    GET_FILENAME_COMPONENT(Bzip2_LIBRARY_DIRS ${Bzip2_LIBRARY_DIRS} PATH)
+-  ENDIF("${Bzip2_LIBRARY_DIRS}" MATCHES "/include$")
+-
+-  IF(EXISTS "${Bzip2_LIBRARY_DIRS}/lib")
+-    SET(Bzip2_LIBRARY_DIRS ${Bzip2_LIBRARY_DIRS}/lib)
+-  ENDIF(EXISTS "${Bzip2_LIBRARY_DIRS}/lib")
+-
+-  # Find Bzip2 libraries
+-  FIND_LIBRARY(Bzip2_DEBUG_LIBRARY NAMES bzip2d bzip2_d libbzip2d libbzip2_d libbzip2
+-               PATH_SUFFIXES Debug ${CMAKE_LIBRARY_ARCHITECTURE} ${CMAKE_LIBRARY_ARCHITECTURE}/Debug
+-               PATHS ${Bzip2_LIBRARY_DIRS} NO_DEFAULT_PATH)
+-  FIND_LIBRARY(Bzip2_RELEASE_LIBRARY NAMES bzip2 libbzip2
+-               PATH_SUFFIXES Release ${CMAKE_LIBRARY_ARCHITECTURE} ${CMAKE_LIBRARY_ARCHITECTURE}/Release
+-               PATHS ${Bzip2_LIBRARY_DIRS} NO_DEFAULT_PATH)
+-
+-  SET(Bzip2_LIBRARIES )
+-  IF(Bzip2_DEBUG_LIBRARY AND Bzip2_RELEASE_LIBRARY)
+-    SET(Bzip2_LIBRARIES debug ${Bzip2_DEBUG_LIBRARY} optimized ${Bzip2_RELEASE_LIBRARY})
+-  ELSEIF(Bzip2_DEBUG_LIBRARY)
+-    SET(Bzip2_LIBRARIES ${Bzip2_DEBUG_LIBRARY})
+-  ELSEIF(Bzip2_RELEASE_LIBRARY)
+-    SET(Bzip2_LIBRARIES ${Bzip2_RELEASE_LIBRARY})
+-  ENDIF(Bzip2_DEBUG_LIBRARY AND Bzip2_RELEASE_LIBRARY)
+-
+-  IF(Bzip2_LIBRARIES)
+-    SET(Bzip2_FOUND TRUE)
+-  ENDIF(Bzip2_LIBRARIES)
+-ENDIF(Bzip2_INCLUDE_DIRS)
+-
+-IF(Bzip2_FOUND)
+-#  IF(NOT Bzip2_FIND_QUIETLY)
+-    MESSAGE(STATUS "Found Bzip2: headers at ${Bzip2_INCLUDE_DIRS}, libraries at ${Bzip2_LIBRARY_DIRS}")
+-    MESSAGE(STATUS "	library is ${Bzip2_LIBRARIES}")    
+-#  ENDIF(NOT Bzip2_FIND_QUIETLY)
+-ELSE(Bzip2_FOUND)
+-  IF(Bzip2_FIND_REQUIRED)
+-    MESSAGE(FATAL_ERROR "Bzip2 library not found")
+-  ENDIF(Bzip2_FIND_REQUIRED)
+-ENDIF(Bzip2_FOUND)
+diff --git a/liblib/CMakeLists.txt b/liblib/CMakeLists.txt
+index e3eddc0f..f38a7ea9 100644
+--- a/liblib/CMakeLists.txt
++++ b/liblib/CMakeLists.txt
+@@ -87,8 +87,8 @@ ENDIF()
+ IF(Zstd_FOUND)
+ SET(TLL_LIBS ${TLL_LIBS} ${Zstd_LIBRARIES})
+ ENDIF()
+-IF(Bz2_FOUND)
+-SET(TLL_LIBS ${TLL_LIBS} ${Bz2_LIBRARIES})
++IF(BZIP2_FOUND)
++SET(TLL_LIBS ${TLL_LIBS} ${BZIP2_LIBRARIES})
+ ENDIF()
+ IF(SZIP_FOUND)
+ SET(TLL_LIBS ${TLL_LIBS} ${SZIP_LIBRARIES})
+diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt
+index 65891d82..a8e1a212 100644
+--- a/plugins/CMakeLists.txt
++++ b/plugins/CMakeLists.txt
+@@ -94,12 +94,12 @@ IF(HAVE_SZ)
+   buildplugin(h5szip "h5szip" ${Szip_LIBRARIES})
+ ENDIF()
+ 
+-IF(HAVE_LOCAL_BZ2)
++IF(HAVE_LOCAL_BZIP2)
+ SET(h5bzip2_SOURCES H5Zbzip2.c blocksort.c huffman.c crctable.c randtable.c compress.c decompress.c bzlib.c bzlib.h bzlib_private.h)
+ buildplugin(h5bzip2 "h5bzip2")
+ ELSE()
+ SET(h5bzip2_SOURCES H5Zbzip2.c)
+-buildplugin(h5bzip2 "h5bzip2" ${Bzip2_LIBRARIES})
++buildplugin(h5bzip2 "h5bzip2" ${BZIP2_LIBRARIES})
+ ENDIF()
+ 
+ 
+@@ -113,7 +113,7 @@ MACRO(installplugin PLUG)
+ ENDMACRO()
+ 
+ install(DIRECTORY DESTINATION ${PLUGIN_INSTALL_DIR})
+-IF(Bzip2_FOUND)
++IF(BZIP2_FOUND)
+ installplugin(h5bzip2)
+ ENDIF()
+ IF(Zstd_FOUND)
+-- 
+2.39.1
+