diff --git a/CMakeLists.txt b/CMakeLists.txt
index 54c88ccd..0cf4085d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,63 +1,71 @@
 project(plasma-mobile)
 cmake_minimum_required (VERSION 2.8)
 
 set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules")
 
 find_package(KDE4 REQUIRED)
 find_package(KActivities 6.0.0 REQUIRED)
 
 include(KDE4Defaults)
 
 add_definitions (${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
 add_definitions(-DDISABLE_NEPOMUK_LEGACY=1)
 
 find_package(Nepomuk REQUIRED)
 find_package(Soprano)
 
 macro_log_feature(
    Soprano_FOUND "Soprano" "Semantic Desktop Storing" "http://soprano.sourceforge.net"
    TRUE "${SOPRANO_MIN_VERSION}" "Soprano is needed for Nepomuk"
    )
 
+find_package(KDeclarative REQUIRED)
+
+macro_log_feature(
+    KDeclarative_FOUND "libkdeclarative" "KDE Declarative (QML) support from kdelibs" "http://www.kde.org"
+    TRUE "" ""
+    )
+
 include(SopranoAddOntology)
 add_definitions(-DDISABLE_NEPOMUK_LEGACY=1)
 
 include_directories(
    ${CMAKE_SOURCE_DIR}
    ${CMAKE_BINARY_DIR}
    ${CMAKE_BINARY_DIR}/inputmethod
    ${KDE4_INCLUDES}
+   ${KDECLARATIVE_INCLUDE_DIR}
    )
 
 MACRO(installPackage dir component)
    SET(root ${ARGN})
    IF(NOT root)
         SET(root plasma/plasmoids)
      ENDIF(NOT root)
     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)
 ENDMACRO(installPackage)
 
 MACRO(add_kao_ontology var)
    soprano_add_ontology(
       ${var}
       ${KACTIVITIES_ONTOLOGIES_DIR}/kao.trig
       "KAO" "Nepomuk::Vocabulary" "trig"
    )
 ENDMACRO(add_kao_ontology)
 
 add_subdirectory(applets)
 add_subdirectory(applications)
 add_subdirectory(artwork)
 add_subdirectory(components)
 add_subdirectory(containments)
 add_subdirectory(dataengines)
 add_subdirectory(qmlpackages)
 add_subdirectory(virtualkeyboard)
 add_subdirectory(wallpapers)
 add_subdirectory(shell)
 add_subdirectory(widgetstrip-shell)
 
 if (BUILD_HANDSET)
    add_subdirectory(handset)
 endif (BUILD_HANDSET)
diff --git a/applications/about/src/CMakeLists.txt b/applications/about/src/CMakeLists.txt
index 34f8ead5..5d887f9a 100644
--- a/applications/about/src/CMakeLists.txt
+++ b/applications/about/src/CMakeLists.txt
@@ -1,26 +1,26 @@
 
 include_directories( ${KDE4_INCLUDES} ${QT_INCLUDES} ../../common )
 
 set(active-aboutapp_SRCS
     main.cpp
     aboutapp.cpp
 )
 
 kde4_add_kdeinit_executable(active-aboutapp ${active-aboutapp_SRCS})
 
 #find_package(ActiveApp REQUIRED)
 
 target_link_libraries(kdeinit_active-aboutapp
     ${QT_QTDECLARATIVE_LIBRARY}
     ${QT_QTOPENGL_LIBRARY}
     ${QT_QTSCRIPT_LIBRARY}
     ${KDE4_KDEUI_LIBS}
     ${KDE4_KIO_LIBS}
     ${KDE4_PLASMA_LIBS}
-    kdeclarative
+    ${KDECLARATIVE_LIBRARIES}
     activeapp
 )
 
 install(TARGETS kdeinit_active-aboutapp ${INSTALL_TARGETS_DEFAULT_ARGS} )
 install(TARGETS active-aboutapp ${INSTALL_TARGETS_DEFAULT_ARGS} )
 
diff --git a/applications/common/CMakeLists.txt b/applications/common/CMakeLists.txt
index eb2ef892..ec2b354a 100644
--- a/applications/common/CMakeLists.txt
+++ b/applications/common/CMakeLists.txt
@@ -1,42 +1,42 @@
 project(activeApp)
 
 find_package(KDE4 REQUIRED)
 include(KDE4Defaults)
 
 include_directories(
    ${CMAKE_SOURCE_DIR}
    ${CMAKE_BINARY_DIR}
    ${KDE4_KIO_INCLUDES}
    ${CMAKE_SOURCE_DIR}/kio
    )
 
 set (activeApp_HEADERS
      activeapp_export.h
      kdeclarativemainwindow.h
      kdeclarativeview.h
     )
 
 set (activeApp_SRCS
      dataenginebindings.cpp
      kdeclarativemainwindow.cpp
      kdeclarativeview.cpp
      )
 
 
 
 qt4_automoc(${activeApp_SRCS})
 
 kde4_add_library (activeapp SHARED ${activeApp_SRCS})
-target_link_libraries(activeapp  ${KDE4_KDECORE_LIBS} ${QT_QTOPENGL_LIBRARY} ${KDE4_PLASMA_LIBS} ${KDE4_KDEUI_LIBS} ${QT_QTDECLARATIVE_LIBRARY} ${QT_QTSCRIPT_LIBRARY} kdeclarative)
+target_link_libraries(activeapp  ${KDE4_KDECORE_LIBS} ${QT_QTOPENGL_LIBRARY} ${KDE4_PLASMA_LIBS} ${KDE4_KDEUI_LIBS} ${QT_QTDECLARATIVE_LIBRARY} ${QT_QTSCRIPT_LIBRARY} ${KDECLARATIVE_LIBRARIES})
 
 
 set_target_properties(activeapp PROPERTIES VERSION 0.1 SOVERSION 0)
 
 install(FILES ${activeApp_HEADERS} DESTINATION ${INCLUDE_INSTALL_DIR}/ COMPONENT Devel)
 
 INSTALL(
     FILES FindActiveApp.cmake
     DESTINATION ${DATA_INSTALL_DIR}/cmake/modules
 )
 
 install(TARGETS activeapp EXPORT activeappLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS})
diff --git a/applications/filebrowser/src/CMakeLists.txt b/applications/filebrowser/src/CMakeLists.txt
index ca1899fe..e16715a2 100644
--- a/applications/filebrowser/src/CMakeLists.txt
+++ b/applications/filebrowser/src/CMakeLists.txt
@@ -1,26 +1,26 @@
 
 include_directories( ${KDE4_INCLUDES} ${QT_INCLUDES} ../../common)
 
 set(active-filebrowser_SRCS
     main.cpp
     filebrowser.cpp
 )
 
 kde4_add_kdeinit_executable(active-filebrowser ${active-filebrowser_SRCS})
 
 #find_package(ActiveApp REQUIRED)
 
 target_link_libraries(kdeinit_active-filebrowser
     ${QT_QTDECLARATIVE_LIBRARY}
     ${QT_QTOPENGL_LIBRARY}
     ${QT_QTSCRIPT_LIBRARY}
     ${KDE4_KDEUI_LIBS}
     ${KDE4_KIO_LIBS}
     ${KDE4_PLASMA_LIBS}
-    kdeclarative
+    ${KDECLARATIVE_LIBRARIES}
     activeapp
 )
 
 install(TARGETS active-filebrowser ${INSTALL_TARGETS_DEFAULT_ARGS} )
 install(TARGETS kdeinit_active-filebrowser ${INSTALL_TARGETS_DEFAULT_ARGS} )
 
diff --git a/applications/settings/src/CMakeLists.txt b/applications/settings/src/CMakeLists.txt
index 6f62f3dd..e9e18f95 100644
--- a/applications/settings/src/CMakeLists.txt
+++ b/applications/settings/src/CMakeLists.txt
@@ -1,18 +1,18 @@
 
 set(active-settings_SRCS
     main.cpp
     activesettings.cpp
     activesettingswindow.cpp
     view.cpp
 )
 
 kde4_add_kdeinit_executable(active-settings ${active-settings_SRCS})
 
 target_link_libraries(kdeinit_active-settings
     ${QT_QTDECLARATIVE_LIBRARY}
     ${KDE4_PLASMA_LIBS}
-    kdeclarative
+    ${KDECLARATIVE_LIBRARIES}
 )
 
 install( TARGETS kdeinit_active-settings ${INSTALL_TARGETS_DEFAULT_ARGS} )
 install( TARGETS active-settings ${INSTALL_TARGETS_DEFAULT_ARGS} )
diff --git a/applications/videoplayer/src/CMakeLists.txt b/applications/videoplayer/src/CMakeLists.txt
index 351b2077..48cbd5ac 100644
--- a/applications/videoplayer/src/CMakeLists.txt
+++ b/applications/videoplayer/src/CMakeLists.txt
@@ -1,37 +1,37 @@
 
 include_directories( ${KDE4_INCLUDES} ${QT_INCLUDES} )
 
 set(active-videoplayer_SRCS
     dataenginebindings.cpp
     main.cpp
     videoplayer.cpp
     videowidget.cpp
     view.cpp
 )
 
 kde4_add_ui_files(
     active-videoplayer_SRCS
     videowindow.ui
 )
 
 qt4_add_dbus_adaptor(
     active-videoplayer_SRCS
     org.mpris.MediaPlayer2.Player.xml
     videowidget.h VideoWidget
 )
 
 KDE4_ADD_EXECUTABLE(active-videoplayer ${active-videoplayer_SRCS})
 
 target_link_libraries(active-videoplayer
     ${QT_QTDECLARATIVE_LIBRARY}
     ${QT_QTOPENGL_LIBRARY}
     ${QT_QTSCRIPT_LIBRARY}
     ${KDE4_KDEUI_LIBS}
     ${KDE4_KIO_LIBS}
     ${KDE4_PLASMA_LIBS}
     ${KDE4_PHONON_LIBRARY}
-    kdeclarative
+    ${KDECLARATIVE_LIBRARIES}
 )
 
 install(TARGETS active-videoplayer ${INSTALL_TARGETS_DEFAULT_ARGS} )
 
diff --git a/applications/webbrowser/src/CMakeLists.txt b/applications/webbrowser/src/CMakeLists.txt
index 51af7ae5..965dd187 100644
--- a/applications/webbrowser/src/CMakeLists.txt
+++ b/applications/webbrowser/src/CMakeLists.txt
@@ -1,69 +1,69 @@
 include_directories(
     ${CMAKE_BINARY_DIR}/dataengines/metadata/ontologies
     ${CMAKE_CURRENT_BINARY_DIR}
     ${CMAKE_CURRENT_BINARY_DIR}/ontologies
     ${CMAKE_CURRENT_SOURCE_DIR}/adblock
    )
 
 add_subdirectory(ontologies)
 
 set(active-webbrowser_SRCS
     main.cpp
     activewebbrowser.cpp
     activebrowserwindow.cpp
     kdeclarativewebview.cpp
     completionitem.cpp
     completionmodel.cpp
     nepomukhelper.cpp
     history.cpp
     view.cpp
 
     networkaccessmanager.cpp
     adblock/adblockhostmatcher.cpp
     adblock/adblockmanager.cpp
     adblock/adblocknetworkreply.cpp
     adblock/adblockrule.cpp
     adblock/adblockrulefallbackimpl.cpp
     adblock/adblockrulenullimpl.cpp
     adblock/adblockruletextmatchimpl.cpp
     #adblock/adblockwidget.cpp
 )
 
 soprano_add_ontology( webbrowser_SRCS
   "${SHAREDDESKTOPONTOLOGIES_ROOT_DIR}/nepomuk/nuao.trig"
   "NUAO"
   "Nepomuk::Vocabulary"
   "trig")
 
 soprano_add_ontology( SRCS
   "${SHAREDDESKTOPONTOLOGIES_ROOT_DIR}/nepomuk/ndo.trig"
   "NDO"
   "Nepomuk::Vocabulary"
   "trig")
 
 #KDE4_ADD_UI_FILES( active-webbrowser_SRCS
 #    adblock/settings_adblock.ui
 #)
 
 kde4_add_kdeinit_executable(active-webbrowser ${active-webbrowser_SRCS})
 
 target_link_libraries(kdeinit_active-webbrowser
     ${QT_QTWEBKIT_LIBRARY}
     ${QT_QTDECLARATIVE_LIBRARY}
     ${QT_QTOPENGL_LIBRARY}
     ${KDE4_KDEUI_LIBS}
     ${KDE4_KIO_LIBS}
     ${KDE4_PLASMA_LIBS}
     ${KDE4_KDEWEBKIT_LIBRARY}
     ${NEPOMUK_LIBRARIES}
     ${NEPOMUK_QUERY_LIBRARIES}
     ${KACTIVITIES_LIBRARY}
-    kdeclarative
+    ${KDECLARATIVE_LIBRARIES}
     ontologies
     nepomukdatamanagement # enable if we want to ue SimpleResource instead of Resource
 )
 
 install(FILES infopage.html DESTINATION ${DATA_INSTALL_DIR}/active-webbrowser )
 
 install( TARGETS active-webbrowser ${INSTALL_TARGETS_DEFAULT_ARGS} )
 install( TARGETS kdeinit_active-webbrowser ${INSTALL_TARGETS_DEFAULT_ARGS} )