diff --git a/cmake/toolchain/heptools-dev-base.cmake b/cmake/toolchain/heptools-dev-base.cmake
index 929d1073d6a0202ebf3dc6c710fbc3b2fded743f..e93b021b942ed7afdf6555bd3dda17b2f546e12f 100644
--- a/cmake/toolchain/heptools-dev-base.cmake
+++ b/cmake/toolchain/heptools-dev-base.cmake
@@ -298,7 +298,7 @@ LCG_external_package(hepmc3            3.3.1
 LCG_external_package(hepstats          0.8.1                                    )
 LCG_external_package(hepunits          2.3.5                                    )
 LCG_external_package(HepPDT            2.06.01                                  )
-LCG_external_package(highfive          2.0                                      )
+LCG_external_package(highfive          2.10.1                                   )
 LCG_external_package(hive              1.1.1                                    )
 LCG_external_package(hist              2.8.0                                    )
 LCG_external_package(histoprint        2.4.0                                    )
diff --git a/generators/CMakeLists.txt b/generators/CMakeLists.txt
index 27c248e8e9f29ab634ebdbb75168944f764079e9..c8d4aa9fcc38e9e0e046cc5870435fc995f5fc37 100644
--- a/generators/CMakeLists.txt
+++ b/generators/CMakeLists.txt
@@ -210,7 +210,7 @@ LCGPackage_Add(
   URL ${GenURL}/MCGeneratorsTarFiles/YODA-<NATIVE_VERSION>.tar.gz
   CONFIGURE_COMMAND <SOURCE_DIR>/configure --prefix=<INSTALL_DIR> CXXFLAGS=-Wno-register
       --with-boost=${Boost_home}
-      IF <VERSION> VERSION_GREATER_EQUAL 2.1.0 THEN --with-hdf5=${hdf5_home}/bin/h5cc ENDIF
+      IF <VERSION> VERSION_GREATER_EQUAL 2.1.0 THEN --with-hdf5=${hdf5_home}/bin/h5cc --with-highfive=${highfive_home} ENDIF
   #IF EXISTS "${ROOT_home}/" THEN
   #    --enable-root
   #    ROOTCONFIG=${ROOT_home}/bin/root-config
@@ -223,7 +223,7 @@ LCGPackage_Add(
   INSTALL_COMMAND ${MAKE} install
   BUILD_IN_SOURCE 1
   DEPENDS Python future
-  IF <VERSION> VERSION_GREATER_EQUAL 2.1.0 THEN hdf5 ENDIF
+  IF <VERSION> VERSION_GREATER_EQUAL 2.1.0 THEN hdf5 highfive ENDIF
   IF <VERSION> VERSION_LESS 1.6.0 THEN
     Boost
   ENDIF
@@ -250,6 +250,7 @@ LCGPackage_Add(
           --disable-pdfmanual
           IF <rivet_<NATIVE_VERSION>_author> VERSION_GREATER_EQUAL 4.0.0 AND <rivet_<NATIVE_VERSION>_author> VERSION_LESS 4.1.0 THEN
               --with-hdf5=${hdf5_home}/bin/h5cc 
+              --with-highfive=${highfive_home}
           ENDIF
           SWIG_LIB=${swig_home}/share/swig/${swig_author_version}
   BUILD_COMMAND ${MAKE} SWIG_LIB=${swig_home}/share/swig/${swig_author_version} 
@@ -259,7 +260,7 @@ LCGPackage_Add(
           COMMAND ${CMAKE_COMMAND} -DINSTALL_DIR=<INSTALL_DIR> -P ${CMAKE_SOURCE_DIR}/cmake/scripts/StripLib.cmake
   BUILD_IN_SOURCE 1
   DEPENDS IF <rivet_<NATIVE_VERSION>_hepmc> EQUAL 2 THEN HepMC ELSE hepmc3 ENDIF 
-  IF <rivet_<NATIVE_VERSION>_author> VERSION_GREATER_EQUAL 4.0.0 AND <rivet_<NATIVE_VERSION>_author> VERSION_LESS 4.1.0 THEN hdf5 ENDIF
+  IF <rivet_<NATIVE_VERSION>_author> VERSION_GREATER_EQUAL 4.0.0 AND <rivet_<NATIVE_VERSION>_author> VERSION_LESS 4.1.0 THEN hdf5 highfive ENDIF
   future
   fastjet 
   Python swig