diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2d02e01c..f0e91843 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -404,10 +404,10 @@ install(
 )
 
 install(
-    EXPORT kdeworkspaceLibraryTargets 
+    EXPORT kdeworkspaceTargets 
     NAMESPACE ${KDE4WORKSPACE_TARGET_PREFIX}
     DESTINATION ${KDE4_DATA_INSTALL_DIR}/cmake/KDE4Workspace
-    FILE KDE4WorkspaceLibraryTargets.cmake
+    FILE KDE4WorkspaceTargets.cmake
 )
 
 feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
diff --git a/KDE4WorkspaceConfig.cmake.in b/KDE4WorkspaceConfig.cmake.in
index 08a2ae51..f6fdfc4c 100644
--- a/KDE4WorkspaceConfig.cmake.in
+++ b/KDE4WorkspaceConfig.cmake.in
@@ -1,31 +1,17 @@
-# KDE4WorkspaceConfig.cmake is generated by CMake from kde-workspace/KDE4WorkspaceConfig.cmake.in
+# Only do something if it hasn't been found yet
+if(NOT KDE4WORKSPACE_FOUND)
+    set(KDE4WORKSPACE_FOUND TRUE)
 
-find_package(KDELibs4 REQUIRED QUIET)
+    find_package(KDELibs4 QUIET REQUIRED)
 
-# the exports file exports 
-set(KDE4WORKSPACE_TARGET_PREFIX @KDE4WORKSPACE_TARGET_PREFIX@)
+    # the exports namespace
+    set(KDE4WORKSPACE_TARGET_PREFIX @KDE4WORKSPACE_TARGET_PREFIX@)
 
-# Make sure to load the exported targets only once
-# For the rest of this script it doesn't matter that much
-if(NOT TARGET @KDE4WORKSPACE_TARGET_PREFIX@plasmaclock)
-    get_filename_component(_currentDir "${CMAKE_CURRENT_LIST_FILE}" PATH)
-    include("${_currentDir}/KDE4WorkspaceLibraryTargets.cmake")
-endif(NOT TARGET @KDE4WORKSPACE_TARGET_PREFIX@plasmaclock)
-
-macro(_KDE4WORKSPACE_Set_Lib_Vars _prefix _lib)
-    set(KDE4WORKSPACE_${_prefix}_LIBRARY ${KDE4WORKSPACE_TARGET_PREFIX}${_lib})
-    set(KDE4WORKSPACE_${_prefix}_LIBS    ${KDE4WORKSPACE_TARGET_PREFIX}${_lib})
-endmacro(_KDE4WORKSPACE_Set_Lib_Vars)
-
-
-_kde4workspace_set_lib_vars( TASKMANAGER        taskmanager)
-_kde4workspace_set_lib_vars( KWORKSPACE         kworkspace)
-_kde4workspace_set_lib_vars( PROCESSUI          processui)
-_kde4workspace_set_lib_vars( LSOFUI             lsofui)
-_kde4workspace_set_lib_vars( PLASMACLOCK        plasmaclock)
-_kde4workspace_set_lib_vars( WEATHERION         weather_ion)
-_kde4workspace_set_lib_vars( KWINEFFECTS        kwineffects)
-_kde4workspace_set_lib_vars( KDECORATIONS       kdecorations)
-_kde4workspace_set_lib_vars( KSGRD              ksgrd)
-_kde4workspace_set_lib_vars( KONQ               konq)
+    get_filename_component(kde4workspace_config_dir ${CMAKE_CURRENT_LIST_FILE} PATH)
+    include(${kde4workspace_config_dir}/KDE4WorkspaceConfigVersion.cmake)
+    include(${kde4workspace_config_dir}/KDE4WorkspaceTargets.cmake)
 
+    if(NOT KDE4WORKSPACE_FIND_QUIETLY)
+        message(STATUS "Found KDE4Workspace version: ${KDE4WORKSPACE_VERSION}")
+    endif()
+endif()
diff --git a/kwin/libkdecorations/CMakeLists.txt b/kwin/libkdecorations/CMakeLists.txt
index 652b45cd..3bfc2138 100644
--- a/kwin/libkdecorations/CMakeLists.txt
+++ b/kwin/libkdecorations/CMakeLists.txt
@@ -18,7 +18,7 @@ set_target_properties(kdecorations PROPERTIES
 )
 install(
     TARGETS kdecorations
-    EXPORT kdeworkspaceLibraryTargets
+    EXPORT kdeworkspaceTargets
     DESTINATION ${KDE4_LIB_INSTALL_DIR}
 )
 
diff --git a/kwin/libkwineffects/CMakeLists.txt b/kwin/libkwineffects/CMakeLists.txt
index e48dbc5e..adf6c9c6 100644
--- a/kwin/libkwineffects/CMakeLists.txt
+++ b/kwin/libkwineffects/CMakeLists.txt
@@ -45,7 +45,7 @@ set_target_properties(kwineffects PROPERTIES
 
 install(
     TARGETS kwineffects
-    EXPORT kdeworkspaceLibraryTargets
+    EXPORT kdeworkspaceTargets
     DESTINATION ${KDE4_LIB_INSTALL_DIR}
 )
 
diff --git a/libs/konq/CMakeLists.txt b/libs/konq/CMakeLists.txt
index 50366d84..87513083 100644
--- a/libs/konq/CMakeLists.txt
+++ b/libs/konq/CMakeLists.txt
@@ -33,7 +33,7 @@ set_target_properties(konq PROPERTIES
 
 install(
     TARGETS konq
-    EXPORT kdeworkspaceLibraryTargets
+    EXPORT kdeworkspaceTargets
     DESTINATION ${KDE4_LIB_INSTALL_DIR}
 )
 
diff --git a/libs/ksysguard/ksgrd/CMakeLists.txt b/libs/ksysguard/ksgrd/CMakeLists.txt
index d623639a..ca150cd1 100644
--- a/libs/ksysguard/ksgrd/CMakeLists.txt
+++ b/libs/ksysguard/ksgrd/CMakeLists.txt
@@ -22,7 +22,7 @@ set_target_properties(ksgrd PROPERTIES
 
 install(
     TARGETS ksgrd
-    EXPORT kdeworkspaceLibraryTargets
+    EXPORT kdeworkspaceTargets
     DESTINATION ${KDE4_LIB_INSTALL_DIR}
 )
 
diff --git a/libs/ksysguard/lsofui/CMakeLists.txt b/libs/ksysguard/lsofui/CMakeLists.txt
index 9e0a357a..2ca6e69b 100644
--- a/libs/ksysguard/lsofui/CMakeLists.txt
+++ b/libs/ksysguard/lsofui/CMakeLists.txt
@@ -16,7 +16,7 @@ set_target_properties(lsofui PROPERTIES
 
 install(
     TARGETS lsofui
-    EXPORT kdeworkspaceLibraryTargets
+    EXPORT kdeworkspaceTargets
     DESTINATION ${KDE4_LIB_INSTALL_DIR}
 )
 
diff --git a/libs/ksysguard/processcore/CMakeLists.txt b/libs/ksysguard/processcore/CMakeLists.txt
index a64856e9..3a13d8cf 100644
--- a/libs/ksysguard/processcore/CMakeLists.txt
+++ b/libs/ksysguard/processcore/CMakeLists.txt
@@ -26,7 +26,7 @@ set_target_properties(processcore PROPERTIES
 
 install(
     TARGETS processcore
-    EXPORT kdeworkspaceLibraryTargets
+    EXPORT kdeworkspaceTargets
     DESTINATION ${KDE4_LIB_INSTALL_DIR}
 )
 
diff --git a/libs/ksysguard/processui/CMakeLists.txt b/libs/ksysguard/processui/CMakeLists.txt
index a3f5faf0..d5055aa1 100644
--- a/libs/ksysguard/processui/CMakeLists.txt
+++ b/libs/ksysguard/processui/CMakeLists.txt
@@ -1,5 +1,8 @@
 
-include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/../  ../processcore/)
+include_directories(
+    ${CMAKE_CURRENT_SOURCE_DIR}/../
+    ../processcore/
+)
 
 set(processui_LIB_SRCS
    ksysguardprocesslist.cpp
@@ -20,7 +23,6 @@ endif()
 target_link_libraries(processui PRIVATE ${QT_QTSCRIPT_LIBRARY})
 target_link_libraries(processui PUBLIC KDE4::kdeui processcore)
 
-
 set_target_properties(processui
     PROPERTIES VERSION ${GENERIC_LIB_VERSION}
     SOVERSION ${GENERIC_LIB_SOVERSION}
@@ -28,7 +30,7 @@ set_target_properties(processui
 
 install(
     TARGETS processui
-    EXPORT kdeworkspaceLibraryTargets
+    EXPORT kdeworkspaceTargets
     DESTINATION ${KDE4_LIB_INSTALL_DIR}
 )
 
diff --git a/libs/ksysguard/signalplotter/CMakeLists.txt b/libs/ksysguard/signalplotter/CMakeLists.txt
index 3dec0aac..ef4b01ff 100644
--- a/libs/ksysguard/signalplotter/CMakeLists.txt
+++ b/libs/ksysguard/signalplotter/CMakeLists.txt
@@ -12,7 +12,7 @@ set_target_properties(ksignalplotter
 
 install(
     TARGETS ksignalplotter
-    EXPORT kdeworkspaceLibraryTargets
+    EXPORT kdeworkspaceTargets
     DESTINATION ${KDE4_LIB_INSTALL_DIR}
 )
 
diff --git a/libs/kworkspace/CMakeLists.txt b/libs/kworkspace/CMakeLists.txt
index c24d73a4..b87c43df 100644
--- a/libs/kworkspace/CMakeLists.txt
+++ b/libs/kworkspace/CMakeLists.txt
@@ -37,7 +37,7 @@ generate_export_header(kworkspace)
 
 install(
     TARGETS kworkspace
-    EXPORT kdeworkspaceLibraryTargets
+    EXPORT kdeworkspaceTargets
     DESTINATION ${KDE4_LIB_INSTALL_DIR}
 )
 
diff --git a/libs/plasmaclock/CMakeLists.txt b/libs/plasmaclock/CMakeLists.txt
index 474e5934..c801eec6 100644
--- a/libs/plasmaclock/CMakeLists.txt
+++ b/libs/plasmaclock/CMakeLists.txt
@@ -33,6 +33,6 @@ install(
 )
 install(
     TARGETS plasmaclock
-    EXPORT kdeworkspaceLibraryTargets
+    EXPORT kdeworkspaceTargets
     DESTINATION ${KDE4_LIB_INSTALL_DIR}
 )
diff --git a/libs/plasmagenericshell/CMakeLists.txt b/libs/plasmagenericshell/CMakeLists.txt
index 84c5b351..054354dd 100644
--- a/libs/plasmagenericshell/CMakeLists.txt
+++ b/libs/plasmagenericshell/CMakeLists.txt
@@ -71,7 +71,7 @@ install(
 
 install(
     TARGETS plasmagenericshell
-    EXPORT kdeworkspaceLibraryTargets
+    EXPORT kdeworkspaceTargets
     DESTINATION ${KDE4_LIB_INSTALL_DIR}
 )
 install(
diff --git a/libs/taskmanager/CMakeLists.txt b/libs/taskmanager/CMakeLists.txt
index 8326a13e..5f2cbd5d 100644
--- a/libs/taskmanager/CMakeLists.txt
+++ b/libs/taskmanager/CMakeLists.txt
@@ -49,7 +49,7 @@ generate_export_header(taskmanager)
 
 install(
     TARGETS taskmanager
-    EXPORT kdeworkspaceLibraryTargets
+    EXPORT kdeworkspaceTargets
     DESTINATION ${KDE4_LIB_INSTALL_DIR}
 )
 
diff --git a/plasma/dataengines/weather/ions/CMakeLists.txt b/plasma/dataengines/weather/ions/CMakeLists.txt
index 5e24bee4..7eb7769f 100644
--- a/plasma/dataengines/weather/ions/CMakeLists.txt
+++ b/plasma/dataengines/weather/ions/CMakeLists.txt
@@ -16,7 +16,7 @@ generate_export_header(weather_ion BASE_NAME ion)
 
 install(
     TARGETS weather_ion
-    EXPORT kdeworkspaceLibraryTargets
+    EXPORT kdeworkspaceTargets
     DESTINATION ${KDE4_LIB_INSTALL_DIR}
 )