diff --git a/CMake/ITKConfig.cmake.in b/CMake/ITKConfig.cmake.in
index 0ec51c93836..b7003d48546 100644
--- a/CMake/ITKConfig.cmake.in
+++ b/CMake/ITKConfig.cmake.in
@@ -37,10 +37,8 @@ set(ITK_USE_FILE "@ITK_USE_FILE@")
 # Whether ITK was built with shared libraries.
 set(ITK_BUILD_SHARED "@ITK_BUILD_SHARED_LIBS@")
 
-# List of available ITK modules, from the current installed modules
-file(GLOB ITK_MODULES_ENABLED RELATIVE "${ITK_MODULES_DIR}"  "${ITK_MODULES_DIR}/*.cmake")
-string(REPLACE ".cmake" "" ITK_MODULES_ENABLED "${ITK_MODULES_ENABLED}")
-list(SORT ITK_MODULES_ENABLED)
+# List of available ITK modules.
+set(ITK_MODULES_ENABLED "@ITK_CONFIG_MODULES_ENABLED@")
 
 # Import ITK targets.
 set(ITK_CONFIG_TARGETS_FILE "@ITK_CONFIG_TARGETS_FILE@")
diff --git a/CMake/ITKModuleExternal.cmake b/CMake/ITKModuleExternal.cmake
index b3c4da0452a..ee27fbdf5f7 100644
--- a/CMake/ITKModuleExternal.cmake
+++ b/CMake/ITKModuleExternal.cmake
@@ -79,6 +79,7 @@ set(${itk-module}-targets-build-directory "${ITK_DIR}/${ITK_INSTALL_PACKAGE_DIR}
 file(MAKE_DIRECTORY ${${itk-module}-targets-build-directory})
 set(${itk-module}-targets-build "${${itk-module}-targets-build-directory}/${itk-module}Targets.cmake")
 set(${itk-module}_TARGETS_FILE_BUILD "${${itk-module}-targets-build}")
+set(${itk-module}_ENABLE_SHARED "${ITK_MODULE_${itk-module}_ENABLE_SHARED}")
 itk_module_impl()
 
 if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/src/CMakeLists.txt AND NOT ${itk-module}_NO_SRC AND "${${itk-module}-targets}")
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3c1cad2d1a9..ab45f342891 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -196,11 +196,8 @@ endif()
 if(NOT CMAKE_ARCHIVE_OUTPUT_DIRECTORY)
   set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${ITK_BINARY_DIR}/lib)
 endif()
-
 set(ITK_MODULES_DIR "${ITK_BINARY_DIR}/${ITK_INSTALL_PACKAGE_DIR}/Modules")
-# Remove previously configured ITK module directory to keep the
-# enabled modules synchronized.
-file(REMOVE_RECURSE "${ITK_MODULES_DIR}")
+
 
 #-----------------------------------------------------------------------------
 # Provide compatibility options.