diff --git a/CMakeLists.txt b/CMakeLists.txt
index 700a62e2a..ce13aea0e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -137,7 +137,7 @@ if(QCA2_FOUND)
     )
 endif()
 
-
+include(PlasmaMacros.cmake)
 
 ################# configure checks and create the configured files #################
 
@@ -145,20 +145,6 @@ endif()
 configure_file(config-prefix.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-prefix.h )
 configure_file(config-compiler.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-compiler.h )
 
-
-macro(installPackage dir component)
-   set(root ${ARGV2})
-   set(type ${ARGV3})
-   if(NOT root)
-      set(root plasma/plasmoids)
-   endif()
-   if(NOT type)
-      set(type applet)
-   endif()
-   install(DIRECTORY ${dir}/ DESTINATION ${DATA_INSTALL_DIR}/${root}/${component} PATTERN .svn EXCLUDE PATTERN CMakeLists.txt EXCLUDE PATTERN Messages.sh EXCLUDE)
-   install(FILES ${dir}/metadata.desktop DESTINATION ${SERVICES_INSTALL_DIR} RENAME plasma-${type}-${component}.desktop)
-endmacro()
-
 ################ create PlasmaConfig.cmake and install it ###########################
 
 
@@ -194,15 +180,6 @@ install(FILES
 #         FILE plasmaTargets.cmake COMPONENT Devel)
 
 
-# install(FILES
-#             "${CMAKE_CURRENT_SOURCE_DIR}/PlasmaMacros.cmake"
-#             "FindPlasma.cmake"
-#         DESTINATION
-#             ${DATA_INSTALL_DIR}/cmake/modules
-#        )
-
-
-
 ################# list the subdirectories #################
 add_subdirectory(src)
 add_subdirectory( desktoptheme )
diff --git a/PlasmaConfig.cmake.in b/PlasmaConfig.cmake.in
index 760a329f5..cb28a7464 100644
--- a/PlasmaConfig.cmake.in
+++ b/PlasmaConfig.cmake.in
@@ -6,9 +6,3 @@ set(Plasma_INSTALL_PREFIX "@PACKAGE_CMAKE_INSTALL_PREFIX@")
 set_and_check(Plasma_INCLUDE_DIR    "@PACKAGE_INCLUDE_INSTALL_DIR@")
 
 include("${CMAKE_CURRENT_LIST_DIR}/PlasmaMacros.cmake")
-
-
-macro(fsck)
-    message("FSCK!!!!")
-endmacro()
-
diff --git a/PlasmaMacros.cmake b/PlasmaMacros.cmake
index 8a202d3de..0db7d0a0c 100644
--- a/PlasmaMacros.cmake
+++ b/PlasmaMacros.cmake
@@ -1,6 +1,4 @@
 
-
-
 find_package(KF5 MODULE REQUIRED COMPONENTS InstallDirs)
 
 macro(installPackage dir component)