diff --git a/CMakeLists.txt b/CMakeLists.txt
index 671aedf54..ca26a0f1d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -146,12 +146,16 @@ configure_file(config-compiler.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-compil
 
 
 macro(installPackage dir component)
-   set(root ${ARGN})
+   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 Messages.sh EXCLUDE)
-   install(FILES ${dir}/metadata.desktop DESTINATION ${SERVICES_INSTALL_DIR} RENAME plasma-applet-${component}.desktop)
+   install(FILES ${dir}/metadata.desktop DESTINATION ${SERVICES_INSTALL_DIR} RENAME plasma-${type}-${component}.desktop)
 endmacro()
 
 ################# list the subdirectories #################