diff --git a/CMakeLists.txt b/CMakeLists.txt
index 04cf6bba0..700a62e2a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -185,15 +185,21 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/plasma_version.h
 install(FILES
   "${CMAKE_CURRENT_BINARY_DIR}/PlasmaConfig.cmake"
   "${CMAKE_CURRENT_BINARY_DIR}/PlasmaConfigVersion.cmake"
+  "${CMAKE_CURRENT_SOURCE_DIR}/PlasmaMacros.cmake"
   DESTINATION "${CMAKECONFIG_INSTALL_DIR}"
   COMPONENT Devel
 )
-install(FILES
-            "${CMAKE_CURRENT_SOURCE_DIR}/PlasmaMacros.cmake"
-            "FindPlasma.cmake"
-        DESTINATION
-            ${DATA_INSTALL_DIR}/cmake/modules
-       )
+
+# install(EXPORT plasmaTargets DESTINATION "${CMAKECONFIG_INSTALL_DIR}"
+#         FILE plasmaTargets.cmake COMPONENT Devel)
+
+
+# install(FILES
+#             "${CMAKE_CURRENT_SOURCE_DIR}/PlasmaMacros.cmake"
+#             "FindPlasma.cmake"
+#         DESTINATION
+#             ${DATA_INSTALL_DIR}/cmake/modules
+#        )
 
 
 
diff --git a/PlasmaConfig.cmake.in b/PlasmaConfig.cmake.in
index 8b7db907c..760a329f5 100644
--- a/PlasmaConfig.cmake.in
+++ b/PlasmaConfig.cmake.in
@@ -5,9 +5,7 @@
 set(Plasma_INSTALL_PREFIX "@PACKAGE_CMAKE_INSTALL_PREFIX@")
 set_and_check(Plasma_INCLUDE_DIR    "@PACKAGE_INCLUDE_INSTALL_DIR@")
 
-include("PlasmaMacros.cmake")
-#include("${CMAKE_CURRENT_SOURCE_DIR}/PlasmaMacros.cmake")
-include("${CMAKE_CURRENT_LIST_DIR}/PlasmaTargets.cmake")
+include("${CMAKE_CURRENT_LIST_DIR}/PlasmaMacros.cmake")
 
 
 macro(fsck)