diff --git a/kcm_gtk/CMakeLists.txt b/kcm_gtk/CMakeLists.txt
index 9133b39..21a2765 100644
--- a/kcm_gtk/CMakeLists.txt
+++ b/kcm_gtk/CMakeLists.txt
@@ -19,7 +19,7 @@ include( TDEMacros )
         mozillaprofile.ui
         emacsdetails.ui
         searchpaths.ui
-    LINK ${TQT_LIBRARIES} -lkdecore -lkdeui
+    LINK ${TQT_LIBRARIES} -ltdecore -ltdeui
     DESTINATION ${PLUGIN_INSTALL_DIR}
   )
 
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index d2e5c03..6eaaad4 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -11,7 +11,7 @@ ADD_LIBRARY(qtengine SHARED ${GTK-QT-SOURCES})
 SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${GTK_CFLAGS} ${BONOBO_CFLAGS}")
 SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${GTK_CFLAGS} ${BONOBO_CFLAGS}")
 
-TARGET_LINK_LIBRARIES(qtengine ${GTK_LINK_FLAGS} ${BONOBO_LINK_FLAGS} ${TQT_LIBRARIES} -lX11 -lkdecore)
+TARGET_LINK_LIBRARIES(qtengine ${GTK_LINK_FLAGS} ${BONOBO_LINK_FLAGS} ${TQT_LIBRARIES} -lX11 -ltdecore)
 
 INSTALL(
 	TARGETS qtengine
diff --git a/src/qt_qt_wrapper.cpp b/src/qt_qt_wrapper.cpp
index bb62a04..b5b9d19 100644
--- a/src/qt_qt_wrapper.cpp
+++ b/src/qt_qt_wrapper.cpp
@@ -475,7 +475,7 @@ GdkFilterReturn gdkEventFilter(GdkXEvent *xevent, GdkEvent *gevent, gpointer dat
 	if ((event->type == ClientMessage) && (event->xclient.message_type == kipcCommAtom))
 	{
 		// This data variable contains the type of KIPC message
-		// As defined in kdelibs/kdecore/kipc.h, 2 = StyleChanged
+		// As defined in kdelibs/tdecore/kipc.h, 2 = StyleChanged
 		if (event->xclient.data.l[0] != 2)
 			return GDK_FILTER_REMOVE;