diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8512c9213..40a792581 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -117,7 +117,7 @@ option( WITH_GCC_VISIBILITY "Enable fvisibility and fvisibility-inlines-hidden"
 # WITH_ARTS         affects libkonq khotkeys
 # WITH_I8K          affects ksysguard
 # WITH_SENSORS      affects ksysguard
-# WITH_HAL          affects tdeioslaves(media) ksmserver
+# WITH_HAL          affects tdeioslaves(media) ksmserver kicker
 # WITH_TDEHWLIB     affects tdeioslaves(media), replaces WITH_HAL on systems without HAL
 # WITH_LIBRAW1394   affects kcontrol(view1394)
 # WITH_PAM          affects tdm kdesktop kcheckpass
diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake
index ce20b392b..6a1d1a457 100644
--- a/ConfigureChecks.cmake
+++ b/ConfigureChecks.cmake
@@ -269,8 +269,8 @@ find_package( TDE )
 
 
 
-# dbus (tdm, ksmserver)
-if( BUILD_TDM OR BUILD_KSMSERVER )
+# dbus (tdm)
+if( BUILD_TDM )
 
   pkg_search_module( DBUS dbus-1 )
   if( NOT DBUS_FOUND )
@@ -280,15 +280,9 @@ if( BUILD_TDM OR BUILD_KSMSERVER )
 endif( )
 
 
-# dbus-tqt (tdm, ksmserver, tdeioslaves(media))
-if( BUILD_TDM OR BUILD_KSMSERVER OR BUILD_KICKER OR (BUILD_TDEIOSLAVES AND WITH_HAL) )
+# dbus-tqt (ksmserver, kicker, tdeioslaves(media))
+if( WITH_HAL AND (BUILD_KSMSERVER OR BUILD_KICKER OR BUILD_TDEIOSLAVES) )
 
-  if( BUILD_KSMSERVER AND WITH_UPOWER )
-    pkg_check_modules( DBUS_1_TQT dbus-1-tqt )
-    if( NOT DBUS_1_TQT_FOUND )
-      tde_message_fatal( "dbus-tqt-1 is required, but was not found on your system" )
-    endif( )
-  endif( )
   # check for dbus-tqt
   # dbus-tqt need Qt flags
   pkg_check_modules( DBUS_TQT REQUIRED dbus-tqt )
diff --git a/kcontrol/krdb/CMakeLists.txt b/kcontrol/krdb/CMakeLists.txt
index eeba6f8ec..035505d98 100644
--- a/kcontrol/krdb/CMakeLists.txt
+++ b/kcontrol/krdb/CMakeLists.txt
@@ -23,7 +23,6 @@ include_directories(
 
 link_directories(
   ${TQT_LIBRARY_DIRS}
-  ${DBUS_TQT_LIBRARY_DIRS}
 )
 
 ##### other data ################################
diff --git a/khelpcenter/CMakeLists.txt b/khelpcenter/CMakeLists.txt
index dc1165fe7..279ecd389 100644
--- a/khelpcenter/CMakeLists.txt
+++ b/khelpcenter/CMakeLists.txt
@@ -22,7 +22,6 @@ include_directories(
 
 link_directories(
   ${TQT_LIBRARY_DIRS}
-  ${DBUS_TQT_LIBRARY_DIRS}
 )
 
 
diff --git a/khotkeys/kcontrol/CMakeLists.txt b/khotkeys/kcontrol/CMakeLists.txt
index 1f56d5443..73f295447 100644
--- a/khotkeys/kcontrol/CMakeLists.txt
+++ b/khotkeys/kcontrol/CMakeLists.txt
@@ -23,7 +23,6 @@ include_directories(
 
 link_directories(
   ${TQT_LIBRARY_DIRS}
-  ${DBUS_TQT_LIBRARY_DIRS}
 )
 
 
diff --git a/kicker/kicker/ui/k_new_mnu.cpp b/kicker/kicker/ui/k_new_mnu.cpp
index a083872fc..52b131781 100644
--- a/kicker/kicker/ui/k_new_mnu.cpp
+++ b/kicker/kicker/ui/k_new_mnu.cpp
@@ -104,15 +104,15 @@
 
 #include "config.h"
 
+#ifdef COMPILE_HALBACKEND
 #ifndef NO_QT3_DBUS_SUPPORT
 /* We acknowledge the the dbus API is unstable */
 #define DBUS_API_SUBJECT_TO_CHANGE
 #include <dbus/connection.h>
 #endif // NO_QT3_DBUS_SUPPORT
 
-#ifdef COMPILE_HALBACKEND
 #include <hal/libhal.h>
-#endif
+#endif // COMPILE_HALBACKEND
 
 #define WAIT_BEFORE_QUERYING 700
 
diff --git a/kicker/kicker/ui/k_new_mnu.h b/kicker/kicker/ui/k_new_mnu.h
index 7276e874a..49982d96f 100644
--- a/kicker/kicker/ui/k_new_mnu.h
+++ b/kicker/kicker/ui/k_new_mnu.h
@@ -45,15 +45,15 @@
 
 #include <config.h>
 
+#ifdef COMPILE_HALBACKEND
 #ifndef NO_QT3_DBUS_SUPPORT
 /* We acknowledge the the dbus API is unstable */
 #define DBUS_API_SUBJECT_TO_CHANGE
 #include <dbus/connection.h>
 #endif // NO_QT3_DBUS_SUPPORT
 
-#ifdef COMPILE_HALBACKEND
 #include <hal/libhal.h>
-#endif
+#endif // COMPILE_HALBACKEND
 
 class KickerClientMenu;
 class KickoffTabBar;
diff --git a/kicker/taskmanager/CMakeLists.txt b/kicker/taskmanager/CMakeLists.txt
index 6e4a14f2c..852b6d52c 100644
--- a/kicker/taskmanager/CMakeLists.txt
+++ b/kicker/taskmanager/CMakeLists.txt
@@ -38,7 +38,6 @@ include_directories(
 
 link_directories(
   ${TQT_LIBRARY_DIRS}
-  ${DBUS_TQT_LIBRARY_DIRS}
 )
 
 
diff --git a/kreadconfig/CMakeLists.txt b/kreadconfig/CMakeLists.txt
index 04f5b6ec5..a8b2a668b 100644
--- a/kreadconfig/CMakeLists.txt
+++ b/kreadconfig/CMakeLists.txt
@@ -16,7 +16,6 @@ include_directories(
 
 link_directories(
   ${TQT_LIBRARY_DIRS}
-  ${DBUS_TQT_LIBRARY_DIRS}
 )
 
 
diff --git a/ksmserver/CMakeLists.txt b/ksmserver/CMakeLists.txt
index dc197e1f8..fdd521b90 100644
--- a/ksmserver/CMakeLists.txt
+++ b/ksmserver/CMakeLists.txt
@@ -23,14 +23,12 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/tdmlib
   ${TDE_INCLUDE_DIR}
   ${TQT_INCLUDE_DIRS}
-  ${DBUS_1_TQT_INCLUDE_DIRS}
   ${DBUS_TQT_INCLUDE_DIRS}
   ${HAL_INCLUDE_DIRS}
 )
 
 link_directories(
   ${TQT_LIBRARY_DIRS}
-  ${DBUS_1_TQT_LIBRARY_DIRS}
   ${DBUS_TQT_LIBRARY_DIRS}
 )
 
@@ -50,5 +48,5 @@ tde_add_tdeinit_executable( ksmserver AUTOMOC
     main.cpp server.cpp shutdowndlg.cpp startupdlg.cpp
     legacy.cpp startup.cpp shutdown.cpp client.cpp
     KSMServerInterface.skel server.skel timed.ui
-  LINK dmctl-static tdeui-shared tdersync-shared ${HAL_LIBRARIES} ${DBUS_1_TQT_LIBRARIES} ${DBUS_TQT_LIBRARIES}
+  LINK dmctl-static tdeui-shared tdersync-shared ${HAL_LIBRARIES} ${DBUS_TQT_LIBRARIES}
 )
diff --git a/ksmserver/shutdowndlg.h b/ksmserver/shutdowndlg.h
index d8f6b9d3b..a3864e616 100644
--- a/ksmserver/shutdowndlg.h
+++ b/ksmserver/shutdowndlg.h
@@ -34,20 +34,15 @@ class TDEAction;
 
 #include <config.h>
 
-#ifdef WITH_UPOWER
-	#include <tqdbusconnection.h>
-#else
-	#warning test
+#ifdef COMPILE_HALBACKEND
 	#ifndef NO_QT3_DBUS_SUPPORT
 	/* We acknowledge the the dbus API is unstable */
 	#define DBUS_API_SUBJECT_TO_CHANGE
 	#include <dbus/connection.h>
 	#endif // NO_QT3_DBUS_SUPPORT
 
-	#ifdef COMPILE_HALBACKEND
 	#include <hal/libhal.h>
-	#endif
-#endif // WITH_UPOWER
+#endif // COMPILE_HALBACKEND
 
 // The (singleton) widget that makes/fades the desktop gray.
 class KSMShutdownFeedback : public TQWidget
@@ -153,14 +148,10 @@ private:
 	TQString m_bootOption;
 	TQPopupMenu *targets;
 	TQStringList rebootOptions;
-#ifdef WITH_UPOWER
-	TQT_DBusConnection m_dbusConn;
-#else
 #ifdef COMPILE_HALBACKEND
 	LibHalContext* m_halCtx;
 	DBusConnection *m_dbusConn;
 #endif
-#endif // WITH_UPOWER
 	bool m_lockOnResume;
 	int* m_selection;
 };
diff --git a/kstart/CMakeLists.txt b/kstart/CMakeLists.txt
index f9b9ea14d..8430a421b 100644
--- a/kstart/CMakeLists.txt
+++ b/kstart/CMakeLists.txt
@@ -17,7 +17,6 @@ include_directories(
 
 link_directories(
   ${TQT_LIBRARY_DIRS}
-  ${DBUS_TQT_LIBRARY_DIRS}
 )
 
 
diff --git a/nsplugins/CMakeLists.txt b/nsplugins/CMakeLists.txt
index e5ec62b11..278ac1f88 100644
--- a/nsplugins/CMakeLists.txt
+++ b/nsplugins/CMakeLists.txt
@@ -20,7 +20,6 @@ include_directories(
 
 link_directories(
   ${TQT_LIBRARY_DIRS}
-  ${DBUS_TQT_LIBRARY_DIRS}
 )
 
 
diff --git a/tdeinit/CMakeLists.txt b/tdeinit/CMakeLists.txt
index 4ec5eeb9a..fe94e1218 100644
--- a/tdeinit/CMakeLists.txt
+++ b/tdeinit/CMakeLists.txt
@@ -17,7 +17,6 @@ include_directories(
 
 link_directories(
   ${TQT_LIBRARY_DIRS}
-  ${DBUS_TQT_LIBRARY_DIRS}
 )
 
 
diff --git a/tdeioslave/thumbnail/CMakeLists.txt b/tdeioslave/thumbnail/CMakeLists.txt
index 55b548f71..98664b32a 100644
--- a/tdeioslave/thumbnail/CMakeLists.txt
+++ b/tdeioslave/thumbnail/CMakeLists.txt
@@ -33,7 +33,6 @@ include_directories(
 
 link_directories(
   ${TQT_LIBRARY_DIRS}
-  ${DBUS_TQT_LIBRARY_DIRS}
 )
 
 
diff --git a/tdm/backend/CMakeLists.txt b/tdm/backend/CMakeLists.txt
index 625c8e85b..9f9d0430f 100644
--- a/tdm/backend/CMakeLists.txt
+++ b/tdm/backend/CMakeLists.txt
@@ -14,11 +14,11 @@
 include_directories(
   ${CMAKE_CURRENT_BINARY_DIR}
   ${CMAKE_BINARY_DIR}
-  ${DBUS_TQT_INCLUDE_DIRS}
+  ${DBUS_INCLUDE_DIRS}
 )
 
 link_directories(
-  ${DBUS_TQT_LIBRARY_DIRS}
+  ${DBUS_LIBRARY_DIRS}
 )
 
 ##### tdm (executable) ##########################
@@ -43,6 +43,6 @@ tde_add_executable( tdm
     process.c protodpy.c reset.c resource.c rpcauth.c
     server.c session.c sessreg.c socket.c streams.c
     util.c xdmauth.c xdmcp.c
-  LINK X11 ${XAU_LIBRARIES} ${DBUS_TQT_LIBRARIES} ${CRYPT_LIBRARY} ${PAM_LIBRARY} ${XDMCP_LIBRARIES}
+  LINK X11 ${XAU_LIBRARIES} ${DBUS_LIBRARIES} ${CRYPT_LIBRARY} ${PAM_LIBRARY} ${XDMCP_LIBRARIES}
   DESTINATION ${BIN_INSTALL_DIR}
 )
diff --git a/tdm/backend/client.c b/tdm/backend/client.c
index d6ed5a1da..c9948ebf9 100644
--- a/tdm/backend/client.c
+++ b/tdm/backend/client.c
@@ -95,10 +95,6 @@ extern int loginsuccess( const char *User, const char *Host, const char *Tty, ch
 #define log_to_audit_system(l,h,d,s)	do { ; } while (0)
 #endif
 
-#ifdef WITH_CONSOLE_KIT
-#include "consolekit.h"
-#endif
-
 /*
  * Session data, mostly what struct verify_info was for
  */
@@ -1310,11 +1306,6 @@ StartClient()
 	if (krbtkfile[0] != '\0')
 		env = setEnv( env, "KRBTKFILE", krbtkfile );
 #endif
-#ifdef WITH_CONSOLE_KIT
-	if (ck_session_cookie != NULL) {
-		env = setEnv ( env, "XDG_SESSION_COOKIE", ck_session_cookie );
-	}
-#endif
 #ifdef WITH_CONSOLE_KIT
 	if (ck_session_cookie != NULL) {
 		env = setEnv ( env, "XDG_SESSION_COOKIE", ck_session_cookie );
diff --git a/tqt3integration/utils/CMakeLists.txt b/tqt3integration/utils/CMakeLists.txt
index 15283e74c..da78e6a99 100644
--- a/tqt3integration/utils/CMakeLists.txt
+++ b/tqt3integration/utils/CMakeLists.txt
@@ -21,7 +21,6 @@ include_directories(
 
 link_directories(
   ${TQT_LIBRARY_DIRS}
-  ${DBUS_TQT_LIBRARY_DIRS}
 )
 
 ##### gen (internal executable) ########################
diff --git a/twin/clients/default/CMakeLists.txt b/twin/clients/default/CMakeLists.txt
index efdfadd3f..142a9b783 100644
--- a/twin/clients/default/CMakeLists.txt
+++ b/twin/clients/default/CMakeLists.txt
@@ -20,7 +20,6 @@ include_directories(
 
 link_directories(
   ${TQT_LIBRARY_DIRS}
-  ${DBUS_TQT_LIBRARY_DIRS}
 )
 
 
diff --git a/twin/clients/redmond/CMakeLists.txt b/twin/clients/redmond/CMakeLists.txt
index 02b77258d..b382af454 100644
--- a/twin/clients/redmond/CMakeLists.txt
+++ b/twin/clients/redmond/CMakeLists.txt
@@ -18,7 +18,6 @@ include_directories(
 
 link_directories(
   ${TQT_LIBRARY_DIRS}
-  ${DBUS_TQT_LIBRARY_DIRS}
 )
 
 
diff --git a/twin/data/CMakeLists.txt b/twin/data/CMakeLists.txt
index c70054956..9a0ce88da 100644
--- a/twin/data/CMakeLists.txt
+++ b/twin/data/CMakeLists.txt
@@ -16,7 +16,6 @@ include_directories(
 
 link_directories(
   ${TQT_LIBRARY_DIRS}
-  ${DBUS_TQT_LIBRARY_DIRS}
 )
 
 
diff --git a/twin/lib/CMakeLists.txt b/twin/lib/CMakeLists.txt
index d029635b6..26f0809af 100644
--- a/twin/lib/CMakeLists.txt
+++ b/twin/lib/CMakeLists.txt
@@ -18,7 +18,6 @@ include_directories(
 
 link_directories(
   ${TQT_LIBRARY_DIRS}
-  ${DBUS_TQT_LIBRARY_DIRS}
 )