diff --git a/ports/vtk/CONTROL b/ports/vtk/CONTROL
index 0131e72bbb..3919619ef8 100644
--- a/ports/vtk/CONTROL
+++ b/ports/vtk/CONTROL
@@ -1,5 +1,5 @@
 Source: vtk
-Version: 8.0.1-4
+Version: 8.0.1-5
 Description: Software system for 3D computer graphics, image processing, and visualization
 Build-Depends: zlib, libpng, tiff, libxml2, jsoncpp, glew, freetype, expat, hdf5, libjpeg-turbo, proj4, lz4, libtheora
 
diff --git a/ports/vtk/FindHDF5.cmake b/ports/vtk/FindHDF5.cmake
index b4783c9475..4a8c4a1665 100644
--- a/ports/vtk/FindHDF5.cmake
+++ b/ports/vtk/FindHDF5.cmake
@@ -20,7 +20,7 @@ else()
     message(FATAL_ERROR "could not find target hdf5_hl-*")
 endif()
 
-set(HDF5_LIBRARIES "$<BUILD_INTERFACE:$<$<NOT:$<STREQUAL:\${UNUSED_VARIABLE_NAME_GOES_HERE_VTK},>>:vtk::hdf5::hdf5>>" "$<BUILD_INTERFACE:$<$<NOT:$<STREQUAL:\${UNUSED_VARIABLE_NAME_GOES_HERE_VTK},>>:vtk::hdf5::hdf5_hl>>")
+set(HDF5_LIBRARIES "$<BUILD_INTERFACE:vtk::hdf5::hdf5>" "$<BUILD_INTERFACE:vtk::hdf5::hdf5_hl>")
 
 find_package_handle_standard_args(HDF5
     REQUIRED_VARS HDF5_INCLUDE_DIRS HDF5_LIBRARIES
diff --git a/ports/vtk/portfile.cmake b/ports/vtk/portfile.cmake
index 1168691cc9..f46b47cbf9 100644
--- a/ports/vtk/portfile.cmake
+++ b/ports/vtk/portfile.cmake
@@ -320,6 +320,11 @@ set(VTK_TOOLS
     pvtkpython
 )
 
+file(READ "${CURRENT_PACKAGES_DIR}/share/vtk/Modules/vtkhdf5.cmake" _contents)
+string(REPLACE "vtk::hdf5::hdf5_hl" "" _contents "${_contents}")
+string(REPLACE "vtk::hdf5::hdf5" "" _contents "${_contents}")
+file(WRITE "${CURRENT_PACKAGES_DIR}/share/vtk/Modules/vtkhdf5.cmake" "${_contents}")
+
 foreach(TOOL_NAME IN LISTS VTK_TOOLS)
     _vtk_move_tool("${TOOL_NAME}")
 endforeach()