diff --git a/Infovis/Boost/CMakeLists.txt b/Infovis/Boost/CMakeLists.txt
index f8927baa4421763b31ceae6946058eda5a095a22..2873f8f446f0b7351c873d0b1ce6646b1ebb46f8 100644
--- a/Infovis/Boost/CMakeLists.txt
+++ b/Infovis/Boost/CMakeLists.txt
@@ -1,10 +1,15 @@
-vtk_module_export_info()
-set(Module_HDRS
-  vtkVariantBoostSerialization.h
-  )
-if(NOT VTK_INSTALL_NO_DEVELOPMENT)
-  install(FILES ${Module_HDRS}
-    DESTINATION ${VTK_INSTALL_INCLUDE_DIR}
-    COMPONENT Development
-    )
-endif()
+set(headers
+  vtkVariantBoostSerialization.h)
+
+vtk_module_add_module(VTK::InfovisBoost
+  HEADERS ${headers}
+  HEADER_ONLY)
+
+vtk_module_find_package(
+  PACKAGE     Boost
+  COMPONENTS  serialization
+  FORWARD_VERSION_REQ EXACT
+  VERSION_VAR         "@Boost_MAJOR_VERSION@.@Boost_MINOR_VERSION@.@Boost_SUBMINOR_VERSION@")
+vtk_module_link(VTK::InfovisBoost
+  INTERFACE
+    Boost::serialization)
diff --git a/Infovis/Boost/Testing/Cxx/CMakeLists.txt b/Infovis/Boost/Testing/Cxx/CMakeLists.txt
index d95c8863ac58277dc2018f63a4d3f76880fd8151..e08f72c5d23b1deaa12c9425111cd3f746287070 100644
--- a/Infovis/Boost/Testing/Cxx/CMakeLists.txt
+++ b/Infovis/Boost/Testing/Cxx/CMakeLists.txt
@@ -1,12 +1,5 @@
-find_package(Boost REQUIRED
-  COMPONENTS serialization
-  )
-include_directories(${Boost_INCLUDE_DIRS})
-
 vtk_add_test_cxx(vtkInfovisBoostCxxTests tests
   NO_DATA NO_VALID NO_OUTPUT
   TestVariantSerialization.cxx
   )
 vtk_test_cxx_executable(vtkInfovisBoostCxxTests tests)
-
-vtk_module_link_libraries(vtkInfovisBoostCxxTests LINK_PRIVATE ${Boost_SERIALIZATION_LIBRARY})
diff --git a/Infovis/Boost/module.cmake b/Infovis/Boost/module.cmake
deleted file mode 100644
index fdd621853f5a21db72ee99091782b9a346ae7583..0000000000000000000000000000000000000000
--- a/Infovis/Boost/module.cmake
+++ /dev/null
@@ -1,8 +0,0 @@
-vtk_module(vtkInfovisBoost
-  TEST_DEPENDS
-    vtkTestingCore
-    vtkCommonCore
-  EXCLUDE_FROM_WRAPPING
-  DEPENDS
-    vtkCommonCore
-  )
\ No newline at end of file
diff --git a/Infovis/Boost/vtk.module b/Infovis/Boost/vtk.module
new file mode 100644
index 0000000000000000000000000000000000000000..24ecdb3feba6696470a976410cd0b095d80b326c
--- /dev/null
+++ b/Infovis/Boost/vtk.module
@@ -0,0 +1,9 @@
+NAME
+  VTK::InfovisBoost
+LIBRARY_NAME
+  vtkInfovisBoost
+DEPENDS
+  VTK::CommonCore
+TEST_DEPENDS
+  VTK::TestingCore
+EXCLUDE_WRAP