diff --git a/kdbg/CMakeLists.txt b/kdbg/CMakeLists.txt
index 15bfb28a..5ad7a910 100644
--- a/kdbg/CMakeLists.txt
+++ b/kdbg/CMakeLists.txt
@@ -1,3 +1,5 @@
+project(kdbg)
+
 cmake_minimum_required(VERSION 2.6)
 
 set(KDBG_VERSION 2.5.5)
diff --git a/kdbg/kdbg/CMakeLists.txt b/kdbg/kdbg/CMakeLists.txt
index 141aeb18..8192df08 100644
--- a/kdbg/kdbg/CMakeLists.txt
+++ b/kdbg/kdbg/CMakeLists.txt
@@ -83,6 +83,6 @@ ENDIF (HAVE_LIB_UTIL)
 target_link_libraries(kdbg ${KDE4_KDECORE_LIBS} ${KDE4_KIO_LIBS} ${LIB_UTIL})
 
 install(TARGETS kdbg ${INSTALL_TARGETS_DEFAULT_ARGS})
-install(FILES kdbg.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})
-install(FILES kdbgrc DESTINATION ${CONFIG_INSTALL_DIR})
-install(FILES kdbgui.rc DESTINATION ${DATA_INSTALL_DIR}/kdbg)
+install(FILES kdbg.desktop DESTINATION ${KDE4_XDG_APPS_INSTALL_DIR})
+install(FILES kdbgrc DESTINATION ${KDE4_CONFIG_INSTALL_DIR})
+install(FILES kdbgui.rc DESTINATION ${KDE4_DATA_INSTALL_DIR}/kdbg)
diff --git a/kdbg/po/CMakeLists.txt b/kdbg/po/CMakeLists.txt
index 2ebc313d..b4bd1a49 100644
--- a/kdbg/po/CMakeLists.txt
+++ b/kdbg/po/CMakeLists.txt
@@ -21,7 +21,7 @@ ELSE(NOT GETTEXT_MSGFMT_EXECUTABLE)
 			COMMAND ${GETTEXT_MSGFMT_EXECUTABLE} --check -o ${_gmoFile} ${_poFile}
 			DEPENDS ${_poFile})
 		INSTALL(FILES ${_gmoFile}
-			DESTINATION ${LOCALE_INSTALL_DIR}/${_lang}/LC_MESSAGES/
+			DESTINATION ${KDE4_LOCALE_INSTALL_DIR}/${_lang}/LC_MESSAGES/
 			RENAME ${catalogname}.mo)
 
 	ENDFOREACH(_poFile ${PO_FILES})
diff --git a/massif-visualizer/CMakeLists.txt b/massif-visualizer/CMakeLists.txt
index 6f8a612d..9ccd8cd2 100644
--- a/massif-visualizer/CMakeLists.txt
+++ b/massif-visualizer/CMakeLists.txt
@@ -12,11 +12,11 @@ include (KDE4Defaults)
 include (MacroLibrary)
 
 macro_optional_find_package(KGraphViewer 2.1)
-macro_log_feature(KGRAPHVIEWER_FOUND "KGraphViewer" "KPart to view callgraph dot files."
-                  "http://extragear.kde.org/apps/kgraphviewer/" FALSE ""
-                  "Required for detailed snapshot analysis. From KDE SDK Extragear package, KGraphViewer 2.1 or higher is required.")
-
-macro_display_feature_log()
+set_package_properties(KGraphViewer PROPERTIES
+    DESCRIPTION "KPart to view callgraph dot files."
+    URL "http://extragear.kde.org/apps/kgraphviewer/"
+    PURPOSE "Required for detailed snapshot analysis. From KDE SDK Extragear package, KGraphViewer 2.1 or higher is required."
+)
 
 include_directories(
     ${KDE4_INCLUDES}
diff --git a/massif-visualizer/app/CMakeLists.txt b/massif-visualizer/app/CMakeLists.txt
index da85c5f3..c9767149 100644
--- a/massif-visualizer/app/CMakeLists.txt
+++ b/massif-visualizer/app/CMakeLists.txt
@@ -38,18 +38,18 @@ install( TARGETS massif-visualizer  ${INSTALL_TARGETS_DEFAULT_ARGS} )
 
 install(
     FILES massif-visualizerui.rc documentwidgetui.rc charttabui.rc callgraphtabui.rc
-    DESTINATION ${DATA_INSTALL_DIR}/massif-visualizer
+    DESTINATION ${KDE4_DATA_INSTALL_DIR}/massif-visualizer
 )
 
-install(FILES massif-visualizer-settings.kcfg DESTINATION ${KCFG_INSTALL_DIR})
+install(FILES massif-visualizer-settings.kcfg DESTINATION ${KDE4_KCFG_INSTALL_DIR})
 
-install(PROGRAMS massif-visualizer.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})
+install(PROGRAMS massif-visualizer.desktop DESTINATION ${KDE4_XDG_APPS_INSTALL_DIR})
 
 # XML mime type
 set( SHARED_MIME_INFO_MINIMUM_VERSION "0.30" )
 set( XDG_MIME_INSTALL_DIR "share/mime/packages" )
 find_package( SharedMimeInfo )
 if( SHARED_MIME_INFO_FOUND )
-    install( FILES massif.xml DESTINATION ${XDG_MIME_INSTALL_DIR} )
-    update_xdg_mimetypes( ${XDG_MIME_INSTALL_DIR} )
+    install( FILES massif.xml DESTINATION ${KDE4_XDG_MIME_INSTALL_DIR} )
+    update_xdg_mimetypes( ${KDE4_XDG_MIME_INSTALL_DIR} )
 endif( SHARED_MIME_INFO_FOUND )
diff --git a/massif-visualizer/pics/hicolor/CMakeLists.txt b/massif-visualizer/pics/hicolor/CMakeLists.txt
index b78ce8ad..36463915 100644
--- a/massif-visualizer/pics/hicolor/CMakeLists.txt
+++ b/massif-visualizer/pics/hicolor/CMakeLists.txt
@@ -1 +1 @@
-kde4_install_icons( ${DATA_INSTALL_DIR}/massif-visualizer/icons  )
+kde4_install_icons( ${KDE4_DATA_INSTALL_DIR}/massif-visualizer/icons  )