diff --git a/CMake/KitCommonJavaWrapBlock.cmake b/CMake/KitCommonJavaWrapBlock.cmake
index d8714b0..1a99027 100644
--- a/CMake/KitCommonJavaWrapBlock.cmake
+++ b/CMake/KitCommonJavaWrapBlock.cmake
@@ -6,7 +6,7 @@ SET(KIT_LIBRARY_TARGETS ${KIT_LIBRARY_TARGETS} vtk${KIT}Java)
 TARGET_LINK_LIBRARIES(vtk${KIT}Java vtk${KIT} ${KIT_JAVA_LIBS})
 IF(NOT VTK_INSTALL_NO_LIBRARIES)
   INSTALL(TARGETS vtk${KIT}Java
-    EXPORT ${VTK_INSTALL_EXPORT_NAME}
+    EXPORT ${VTK_INSTALL_EXPORT_NAME}Java
     RUNTIME DESTINATION ${VTK_INSTALL_BIN_DIR_CM24} COMPONENT RuntimeLibraries
     LIBRARY DESTINATION "${VTK_INSTALL_LIB_DIR_CM24}/jni" COMPONENT RuntimeLibraries
     ARCHIVE DESTINATION ${VTK_INSTALL_LIB_DIR_CM24} COMPONENT Development)
diff --git a/CMake/KitCommonPythonWrapBlock.cmake b/CMake/KitCommonPythonWrapBlock.cmake
index 2003ce6..0354507 100644
--- a/CMake/KitCommonPythonWrapBlock.cmake
+++ b/CMake/KitCommonPythonWrapBlock.cmake
@@ -12,7 +12,7 @@ TARGET_LINK_LIBRARIES(
   vtk${KIT}PythonD vtk${KIT} vtkPythonCore ${KIT_PYTHON_LIBS})
 IF(NOT VTK_INSTALL_NO_LIBRARIES)
   INSTALL(TARGETS vtk${KIT}PythonD
-    EXPORT ${VTK_INSTALL_EXPORT_NAME}
+    EXPORT ${VTK_INSTALL_EXPORT_NAME}PythonD
     RUNTIME DESTINATION ${VTK_INSTALL_BIN_DIR_CM24} COMPONENT RuntimeLibraries
     LIBRARY DESTINATION ${VTK_INSTALL_LIB_DIR_CM24} COMPONENT RuntimeLibraries
     ARCHIVE DESTINATION ${VTK_INSTALL_LIB_DIR_CM24} COMPONENT Development)
diff --git a/CMake/KitCommonTclWrapBlock.cmake b/CMake/KitCommonTclWrapBlock.cmake
index 3203312..b69dcf0 100644
--- a/CMake/KitCommonTclWrapBlock.cmake
+++ b/CMake/KitCommonTclWrapBlock.cmake
@@ -14,7 +14,7 @@ TARGET_LINK_LIBRARIES (vtk${KIT}TCL vtk${KIT} ${KIT_TCL_LIBS})
 
 IF(NOT VTK_INSTALL_NO_LIBRARIES)
   INSTALL(TARGETS vtk${KIT}TCL
-    EXPORT ${VTK_INSTALL_EXPORT_NAME}
+    EXPORT ${VTK_INSTALL_EXPORT_NAME}TCL
     RUNTIME DESTINATION ${VTK_INSTALL_BIN_DIR_CM24} COMPONENT RuntimeLibraries
     LIBRARY DESTINATION ${VTK_INSTALL_LIB_DIR_CM24} COMPONENT RuntimeLibraries
     ARCHIVE DESTINATION ${VTK_INSTALL_LIB_DIR_CM24} COMPONENT Development)
diff --git a/Rendering/CMakeLists.txt b/Rendering/CMakeLists.txt
index f6f20ef..8ee4957 100644
--- a/Rendering/CMakeLists.txt
+++ b/Rendering/CMakeLists.txt
@@ -852,7 +852,7 @@ IF (VTK_WRAP_PYTHON AND VTK_USE_TK AND TK_FOUND)
 
   IF(NOT VTK_INSTALL_NO_LIBRARIES)
     INSTALL(TARGETS vtkRenderingPythonTkWidgets
-      EXPORT ${VTK_INSTALL_EXPORT_NAME}
+      EXPORT ${VTK_INSTALL_EXPORT_NAME}PythonD
       RUNTIME DESTINATION ${VTK_INSTALL_BIN_DIR_CM24} COMPONENT RuntimeLibraries
       LIBRARY DESTINATION ${VTK_INSTALL_LIB_DIR_CM24} COMPONENT RuntimeLibraries
       ARCHIVE DESTINATION ${VTK_INSTALL_LIB_DIR_CM24} COMPONENT Development)
diff --git a/Utilities/LastConfigureStep/CMakeLists.txt b/Utilities/LastConfigureStep/CMakeLists.txt
index f52d988..10f8f28 100644
--- a/Utilities/LastConfigureStep/CMakeLists.txt
+++ b/Utilities/LastConfigureStep/CMakeLists.txt
@@ -12,6 +12,15 @@
 GET_PROPERTY(VTK_TARGETS GLOBAL PROPERTY VTK_TARGETS)
 EXPORT(TARGETS ${VTK_TARGETS} FILE ${VTK_BINARY_DIR}/${VTK_INSTALL_EXPORT_NAME}.cmake)
 INSTALL(EXPORT ${VTK_INSTALL_EXPORT_NAME} DESTINATION ${VTK_INSTALL_PACKAGE_DIR_CM24})
+IF(VTK_WRAP_TCL)
+  INSTALL(EXPORT ${VTK_INSTALL_EXPORT_NAME}TCL DESTINATION ${VTK_INSTALL_PACKAGE_DIR_CM24})
+ENDIF(VTK_WRAP_TCL)
+IF(VTK_WRAP_PYTHON)
+  INSTALL(EXPORT ${VTK_INSTALL_EXPORT_NAME}PythonD DESTINATION ${VTK_INSTALL_PACKAGE_DIR_CM24})
+ENDIF(VTK_WRAP_PYTHON)
+IF(VTK_WRAP_JAVA)
+  INSTALL(EXPORT ${VTK_INSTALL_EXPORT_NAME}Java DESTINATION ${VTK_INSTALL_PACKAGE_DIR_CM24})
+ENDIF(VTK_WRAP_JAVA)
 GET_PROPERTY(VTK_LIBRARIES GLOBAL PROPERTY VTK_LIBRARIES)
 #-----------------------------------------------------------------------------
 # Create the VTKConfig.cmake file containing the VTK configuration.
diff --git a/VTKConfig.cmake.in b/VTKConfig.cmake.in
index 3c3a80a..d0a5a46 100644
--- a/VTKConfig.cmake.in
+++ b/VTKConfig.cmake.in
@@ -190,9 +190,17 @@ SET(VTK_CONFIGURATION_TYPES @VTK_CONFIGURATION_TYPES_CONFIG@)
 SET(VTK_BUILD_TYPE @VTK_BUILD_TYPE_CONFIG@)
 
 # The VTK targets file.
-IF(NOT VTK_INSTALL_EXPORT_NAME AND NOT TARGET vtkCommon
-   AND EXISTS "@VTK_TARGETS_FILE@")
-  INCLUDE("@VTK_TARGETS_FILE@")
+IF(NOT VTK_INSTALL_EXPORT_NAME AND NOT TARGET vtkCommon)
+  INCLUDE("@VTK_TARGETS_FILE@" OPTIONAL)
+  IF(VTK_WRAP_JAVA)
+    INCLUDE("@VTK_TARGETS_FILE@Java" OPTIONAL)
+  ENDIF()
+  IF(VTK_WRAP_PYTHON)
+    INCLUDE("@VTK_TARGETS_FILE@Python" OPTIONAL)
+  ENDIF()
+  IF(VTK_WRAP_TCL)
+    INCLUDE("@VTK_TARGETS_FILE@TCL" OPTIONAL)
+  ENDIF()
 ENDIF()
 
 # The old, less clear name for VTK_RUNTIME_LIBRARY_DIRS.  Kept here
diff --git a/Wrapping/CMakeLists.txt b/Wrapping/CMakeLists.txt
index a80d591..f540ce5 100644
--- a/Wrapping/CMakeLists.txt
+++ b/Wrapping/CMakeLists.txt
@@ -36,7 +36,7 @@ IF(NOT CMAKE_CROSSCOMPILING)
    ENDIF(COMPILE_TOOLS_TARGET)
     IF(NOT VTK_INSTALL_NO_DEVELOPMENT)
       INSTALL(TARGETS vtkWrapTcl vtkWrapTclInit
-        EXPORT ${VTK_INSTALL_EXPORT_NAME}
+        EXPORT ${VTK_INSTALL_EXPORT_NAME}TCL
         RUNTIME DESTINATION ${VTK_INSTALL_BIN_DIR_CM24} COMPONENT Development # .exe, .dll
         )
     ENDIF(NOT VTK_INSTALL_NO_DEVELOPMENT)
@@ -56,7 +56,7 @@ IF(NOT CMAKE_CROSSCOMPILING)
     ENDIF(COMPILE_TOOLS_TARGET)
     IF(NOT VTK_INSTALL_NO_DEVELOPMENT)
       INSTALL(TARGETS vtkWrapPython vtkWrapPythonInit
-        EXPORT ${VTK_INSTALL_EXPORT_NAME}
+        EXPORT ${VTK_INSTALL_EXPORT_NAME}PythonD
         RUNTIME DESTINATION ${VTK_INSTALL_BIN_DIR_CM24} COMPONENT Development # .exe, .dll
         )
     ENDIF(NOT VTK_INSTALL_NO_DEVELOPMENT)
@@ -73,7 +73,7 @@ IF(NOT CMAKE_CROSSCOMPILING)
     ENDIF(COMPILE_TOOLS_TARGET)
     IF(NOT VTK_INSTALL_NO_DEVELOPMENT)
       INSTALL(TARGETS vtkParseJava vtkWrapJava
-        EXPORT ${VTK_INSTALL_EXPORT_NAME}
+        EXPORT ${VTK_INSTALL_EXPORT_NAME}Java
         RUNTIME DESTINATION ${VTK_INSTALL_BIN_DIR_CM24} COMPONENT Development # .exe, .dll
         )
     ENDIF(NOT VTK_INSTALL_NO_DEVELOPMENT)
diff --git a/Wrapping/Python/CMakeLists.txt b/Wrapping/Python/CMakeLists.txt
index 8a8d9e2..b04bf18 100644
--- a/Wrapping/Python/CMakeLists.txt
+++ b/Wrapping/Python/CMakeLists.txt
@@ -24,7 +24,7 @@ VTK_ADD_LIBRARY(vtkPythonCore ${VTK_PYTHON_CORE_SRCS})
 TARGET_LINK_LIBRARIES(vtkPythonCore vtkCommon)
 IF(NOT VTK_INSTALL_NO_LIBRARIES)
   INSTALL(TARGETS vtkPythonCore
-    EXPORT ${VTK_INSTALL_EXPORT_NAME}
+    EXPORT ${VTK_INSTALL_EXPORT_NAME}PythonD
     RUNTIME DESTINATION ${VTK_INSTALL_BIN_DIR_CM24} COMPONENT RuntimeLibraries
     LIBRARY DESTINATION ${VTK_INSTALL_LIB_DIR_CM24} COMPONENT RuntimeLibraries
     ARCHIVE DESTINATION ${VTK_INSTALL_LIB_DIR_CM24} COMPONENT Development)