diff --git a/acinclude.m4 b/acinclude.m4
index 8e4f24c..089ae77 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -371,7 +371,7 @@ AC_DEFUN([KDE_1_CHECK_PATHS],
   fi
 
 AC_MSG_CHECKING([for KDE libraries installed])
-ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -lkdecore $LIBQT $KDE_TEST_RPATH 1>&5'
+ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -ltdecore $LIBQT $KDE_TEST_RPATH 1>&5'
 
 if AC_TRY_EVAL(ac_link) && test -s conftest; then
   AC_MSG_RESULT(yes)
@@ -705,7 +705,7 @@ AC_SUBST(kde_templatesdir)
 AC_SUBST(kde_servicesdir)
 AC_SUBST(kde_servicetypesdir)
 AC_SUBST(kde_moduledir)
-AC_SUBST(kdeinitdir, '$(kde_moduledir)')
+AC_SUBST(tdeinitdir, '$(kde_moduledir)')
 AC_SUBST(kde_styledir)
 AC_SUBST(kde_widgetdir)
 if test "$kde_qtver" = 1; then
@@ -2066,8 +2066,8 @@ if test $build_arts = "yes"; then
 fi
 
 if test $kde_qtver = 3; then
-   AC_SUBST(LIB_KDECORE, "-lkdecore")
-   AC_SUBST(LIB_KDEUI, "-lkdeui")
+   AC_SUBST(LIB_KDECORE, "-ltdecore")
+   AC_SUBST(LIB_KDEUI, "-ltdeui")
    AC_SUBST(LIB_KIO, "-lkio")
    AC_SUBST(LIB_KJS, "-lkjs")
    AC_SUBST(LIB_SMB, "-lsmb")
@@ -2076,9 +2076,9 @@ if test $kde_qtver = 3; then
    AC_SUBST(LIB_KHTML, "-lkhtml")
    AC_SUBST(LIB_KSPELL, "-lkspell")
    AC_SUBST(LIB_KPARTS, "-lkparts")
-   AC_SUBST(LIB_KDEPRINT, "-lkdeprint")
+   AC_SUBST(LIB_KDEPRINT, "-ltdeprint")
    AC_SUBST(LIB_KUTILS, "-lkutils")
-   AC_SUBST(LIB_KDEPIM, "-lkdepim")
+   AC_SUBST(LIB_KDEPIM, "-ltdepim")
    AC_SUBST(LIB_KIMPROXY, "-lkimproxy")
    AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff")
    AC_SUBST(LIB_KDNSSD, "-lkdnssd")
@@ -2087,8 +2087,8 @@ if test $kde_qtver = 3; then
    AC_SUBST(LIB_KSYCOCA, "-lkio")
    AC_SUBST(LIB_KFILE, "-lkio")
 elif test $kde_qtver = 2; then
-   AC_SUBST(LIB_KDECORE, "-lkdecore")
-   AC_SUBST(LIB_KDEUI, "-lkdeui")
+   AC_SUBST(LIB_KDECORE, "-ltdecore")
+   AC_SUBST(LIB_KDEUI, "-ltdeui")
    AC_SUBST(LIB_KIO, "-lkio")
    AC_SUBST(LIB_KSYCOCA, "-lksycoca")
    AC_SUBST(LIB_SMB, "-lsmb")
@@ -2097,10 +2097,10 @@ elif test $kde_qtver = 2; then
    AC_SUBST(LIB_KHTML, "-lkhtml")
    AC_SUBST(LIB_KSPELL, "-lkspell")
    AC_SUBST(LIB_KPARTS, "-lkparts")
-   AC_SUBST(LIB_KDEPRINT, "-lkdeprint")
+   AC_SUBST(LIB_KDEPRINT, "-ltdeprint")
 else
-   AC_SUBST(LIB_KDECORE, "-lkdecore -lXext $(LIB_QT)")
-   AC_SUBST(LIB_KDEUI, "-lkdeui $(LIB_KDECORE)")
+   AC_SUBST(LIB_KDECORE, "-ltdecore -lXext $(LIB_QT)")
+   AC_SUBST(LIB_KDEUI, "-ltdeui $(LIB_KDECORE)")
    AC_SUBST(LIB_KFM, "-lkfm $(LIB_KDECORE)")
    AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_KDEUI)")
    AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_KDECORE)")
@@ -2487,7 +2487,7 @@ if eval "test \"`echo $ac_cv_lib_gif`\" = yes"; then
   AC_MSG_RESULT(yes)
   AC_DEFINE_UNQUOTED(HAVE_LIBGIF, 1, [Define if you have libgif])
 else
-  AC_MSG_ERROR(You need giflib30. Please install the kdesupport package)
+  AC_MSG_ERROR(You need giflib30. Please install the tdesupport package)
 fi
 ])
 
diff --git a/basket.kdevelop b/basket.kdevelop
index 46452f0..1d7024f 100644
--- a/basket.kdevelop
+++ b/basket.kdevelop
@@ -48,7 +48,7 @@
       <globalcwd>/home/seb/Programmation/basket/debug</globalcwd>
       <useglobalprogram>true</useglobalprogram>
       <autoinstall>false</autoinstall>
-      <autokdesu>false</autokdesu>
+      <autotdesu>false</autotdesu>
     </run>
     <configurations>
       <optimized>
diff --git a/configure.in b/configure.in
index cd1daa4..b9e8ec3 100644
--- a/configure.in
+++ b/configure.in
@@ -158,14 +158,14 @@ if test x$basket_warning_kontact = xyes; then
     echo " ===  BasKet Note Pads - WARNING  ==================================="
     echo " ===================================="
     echo " ="
-    echo " = BasKet Note Pads requires kdepim."
+    echo " = BasKet Note Pads requires tdepim."
     echo " = BasKet Note Pads will still be built, but there is no"
     echo " = Kontact integration."
     echo " ="
     echo " = Packages you need to install if you want Kontact integration:"
-    echo " =  Suse:         kdepim3-devel"
-    echo " =  Kubuntu:      kdepim-dev"
-    echo " =  Fedora Core:  kdepim-devel"
+    echo " =  Suse:         tdepim3-devel"
+    echo " =  Kubuntu:      tdepim-dev"
+    echo " =  Fedora Core:  tdepim-devel"
     echo " =  Mandriva:     libtdepim2-common-devel & libtdepim2-kontact-devel"
     echo " =  Gentoo:       kde-base/kontact"
     echo " ="
diff --git a/configure.in.bot b/configure.in.bot
index 1ce50fe..3261385 100644
--- a/configure.in.bot
+++ b/configure.in.bot
@@ -26,14 +26,14 @@ if test x$basket_warning_kontact = xyes; then
     echo " ===  BasKet Note Pads - WARNING  ==================================="
     echo " ===================================="
     echo " ="
-    echo " = BasKet Note Pads requires kdepim."
+    echo " = BasKet Note Pads requires tdepim."
     echo " = BasKet Note Pads will still be built, but there is no"
     echo " = Kontact integration."
     echo " ="
     echo " = Packages you need to install if you want Kontact integration:"
-    echo " =  Suse:         kdepim3-devel"
-    echo " =  Kubuntu:      kdepim-dev"
-    echo " =  Fedora Core:  kdepim-devel"
+    echo " =  Suse:         tdepim3-devel"
+    echo " =  Kubuntu:      tdepim-dev"
+    echo " =  Fedora Core:  tdepim-devel"
     echo " =  Mandriva:     libtdepim2-common-devel & libtdepim2-kontact-devel"
     echo " =  Gentoo:       kde-base/kontact"
     echo " ="
diff --git a/file-integration/Makefile.am b/file-integration/Makefile.am
index 79efdcb..555edcb 100644
--- a/file-integration/Makefile.am
+++ b/file-integration/Makefile.am
@@ -11,7 +11,7 @@ INCLUDES = $(all_includes)
 kde_module_LTLIBRARIES = basketthumbcreator.la
 basketthumbcreator_la_SOURCES = basketthumbcreator.cpp
 basketthumbcreator_la_LIBADD = $(LIB_KIO)
-basketthumbcreator_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx
+basketthumbcreator_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx
 kde_services_DATA = basketthumbcreator.desktop
 
 # Icons:
diff --git a/kontact_plugin/Makefile.am b/kontact_plugin/Makefile.am
index e57829c..c01c0d2 100644
--- a/kontact_plugin/Makefile.am
+++ b/kontact_plugin/Makefile.am
@@ -2,7 +2,7 @@ INCLUDES = -I$(top_srcdir)/src -I$(top_builddir)/src -I$(top_srcdir) $(all_inclu
 
 kde_module_LTLIBRARIES = libkontact_basket.la
 libkontact_basket_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
-libkontact_basket_la_LIBADD = -lkpinterfaces $(LIB_QT) -lDCOP -lkdecore -lkdeui
+libkontact_basket_la_LIBADD = -lkpinterfaces $(LIB_QT) -lDCOP -ltdecore -ltdeui
 
 noinst_HEADERS = basket_plugin.h uniqueapphandler.h
 libkontact_basket_la_SOURCES = basket_plugin.cpp uniqueapphandler.cpp basketdcopiface.stub
diff --git a/kontact_plugin/uniqueapphandler.h b/kontact_plugin/uniqueapphandler.h
index a39aa04..c0c2ee8 100644
--- a/kontact_plugin/uniqueapphandler.h
+++ b/kontact_plugin/uniqueapphandler.h
@@ -24,7 +24,7 @@
 
 #include <dcopobject.h>
 #include <kontact/plugin.h>
-#include <kdepimmacros.h>
+#include <tdepimmacros.h>
 
 namespace Kontact
 {
diff --git a/src/Makefile.am b/src/Makefile.am
index 9c2fd75..89c1f95 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -29,10 +29,10 @@ lib_LTLIBRARIES = libbasketcommon.la
 
 AM_CPPFLAGS = $(GPGME_CFLAGS)
 
-libbasketcommon_la_LDFLAGS = -avoid-version -no-undefined $(all_libraries) -lkdecore -lDCOP -lkdeui $(LIB_QT) -lkjs -lkdefx -ldl -lartsc -lartskde -lartskde
+libbasketcommon_la_LDFLAGS = -avoid-version -no-undefined $(all_libraries) -ltdecore -lDCOP -ltdeui $(LIB_QT) -lkjs -ltdefx -ldl -lartsc -lartskde -lartskde
 
 libbasketcommon_la_LIBADD = $(LIB_ARTSKDE) -lkio $(LIB_KDEUI) $(LIB_KDECORE) \
-	$(LIB_QT) $(LIBSOCKET) $(GPGME_LIBS) $(LIB_KPARTS) -lDCOP -lkdefx -lkdeui -lkdecore $(LIB_QT) -lkdefx -ldl -lartsc
+	$(LIB_QT) $(LIBSOCKET) $(GPGME_LIBS) $(LIB_KPARTS) -lDCOP -ltdefx -ltdeui -ltdecore $(LIB_QT) -ltdefx -ldl -lartsc
 
 libbasketcommon_la_SOURCES = \
 	archive.cpp bnpview.cpp settings.cpp basket.cpp basketproperties.cpp \
@@ -55,7 +55,7 @@ libbasketcommon_la_SOURCES = \
 bin_PROGRAMS = basket
 
 # the application source, library search path, and link libraries
-basket_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_KUTILS) -lkdecore -lDCOP -lkdeui $(LIB_QT) -lkjs -lkdefx -ldl -lartsc -lartskde -lartskde
+basket_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_KUTILS) -ltdecore -lDCOP -ltdeui $(LIB_QT) -lkjs -ltdefx -ldl -lartsc -lartskde -lartskde
 basket_LDADD = libbasketcommon.la
 
 # this is where the desktop file will go
@@ -81,12 +81,12 @@ kde_icon_KDEICON = cr128-app-basket.png cr16-app-basket.png cr22-app-basket.png
 kde_module_LTLIBRARIES = kcm_basket.la libbasketpart.la
 
 libbasketpart_la_SOURCES = basket_part.cpp
-libbasketpart_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module -avoid-version -no-undefined -lkdecore -lkdeui $(LIB_QT) -lDCOP -lkjs -lkdefx -ldl -lartsc -lartskde -lartskde
-libbasketpart_la_LIBADD  = libbasketcommon.la -lkparts -lkdeui $(LIB_KDECORE) $(LIB_QT) -lDCOP
+libbasketpart_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module -avoid-version -no-undefined -ltdecore -ltdeui $(LIB_QT) -lDCOP -lkjs -ltdefx -ldl -lartsc -lartskde -lartskde
+libbasketpart_la_LIBADD  = libbasketcommon.la -lkparts -ltdeui $(LIB_KDECORE) $(LIB_QT) -lDCOP
 
 kcm_basket_la_SOURCES = kcm_basket.cpp
-kcm_basket_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined -lkdecore -lkdeui $(LIB_QT) -lDCOP -lkjs -lkdefx -ldl -lartsc -lartskde
-kcm_basket_la_LIBADD = libbasketcommon.la $(LIB_KDECORE) $(LIB_QT) -lkdeui -lDCOP
+kcm_basket_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined -ltdecore -ltdeui $(LIB_QT) -lDCOP -lkjs -ltdefx -ldl -lartsc -lartskde
+kcm_basket_la_LIBADD = libbasketcommon.la $(LIB_KDECORE) $(LIB_QT) -ltdeui -lDCOP
 
 # this is where the desktop file will go
 partdesktopdir   = $(kde_servicesdir)
diff --git a/src/likeback.cpp b/src/likeback.cpp
index 5ed6be7..aafcab9 100644
--- a/src/likeback.cpp
+++ b/src/likeback.cpp
@@ -576,7 +576,7 @@ bool LikeBack::isDevelopmentVersion(const TQString &version)
 }
 
 /**
- * Code from KBugReport::slotConfigureEmail() in kdeui/kbugreport.cpp:
+ * Code from KBugReport::slotConfigureEmail() in tdeui/kbugreport.cpp:
  */
 /*void LikeBack::beginFetchingEmail()
 {
@@ -595,7 +595,7 @@ bool LikeBack::isDevelopmentVersion(const TQString &version)
 }*/
 
 /**
- * Code from KBugReport::slotSetFrom() in kdeui/kbugreport.cpp:
+ * Code from KBugReport::slotSetFrom() in tdeui/kbugreport.cpp:
  */
 void LikeBack::fetchUserEmail()
 {
diff --git a/src/systemtray.cpp b/src/systemtray.cpp
index 52e0f47..503eb3e 100644
--- a/src/systemtray.cpp
+++ b/src/systemtray.cpp
@@ -351,7 +351,7 @@ void SystemTray::dropEvent(TQDropEvent *event)
 /*
  * This function copies the entirety of src into dest, starting in
  * dest at x and y.  This function exists because I was unable to find
- * a function like it in either TQImage or kdefx
+ * a function like it in either TQImage or tdefx
  */
 static bool copyImage(TQImage &dest, TQImage &src, int x, int y)
 {