diff --git a/ChangeLog b/ChangeLog
index d7c6a8c..71c2ea0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4370,7 +4370,7 @@ V 0.1.4-beta1 - 2007-06-04
 	  printed on red and the second one on green. This lets you print
 	  the official
 	  holidays (red) and your private ones (green).
-	  * Because of e) the libkcal (kdepim) dependency has been
+	  * Because of e) the libkcal (tdepim) dependency has been
 	  introduced.
 	  (thanks to Maciek Borowka)
 
diff --git a/acinclude.m4 b/acinclude.m4
index 8d793d6..85f1606 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)
@@ -710,7 +710,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
@@ -2088,12 +2088,12 @@ AC_DEFUN([KDE_CREATE_LIBS_ALIASES],
 
 if test $kde_qtver = 3; then
    case $host in 
-               *cygwin*) lib_kded="-lkdeinit_kded" ;;
+               *cygwin*) lib_kded="-ltdeinit_kded" ;;
                *) lib_kded="" ;;
        esac
    AC_SUBST(LIB_KDED, $lib_kded)
-   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")
@@ -2102,9 +2102,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")
@@ -2113,8 +2113,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")
@@ -2123,10 +2123,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)")
@@ -2513,7 +2513,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/kipi-plugins/ChangeLog b/kipi-plugins/ChangeLog
index e7c7b90..48db6c7 100644
--- a/kipi-plugins/ChangeLog
+++ b/kipi-plugins/ChangeLog
@@ -4496,7 +4496,7 @@ V 0.1.4-beta1 - 2007-06-04
 	  printed on red and the second one on green. This lets you print
 	  the official
 	  holidays (red) and your private ones (green).
-	  * Because of e) the libkcal (kdepim) dependency has been
+	  * Because of e) the libkcal (tdepim) dependency has been
 	  introduced.
 	  (thanks to Maciek Borowka)
 
diff --git a/kipi-plugins/findimages/Makefile.am b/kipi-plugins/findimages/Makefile.am
index 26f3836..b59f64a 100644
--- a/kipi-plugins/findimages/Makefile.am
+++ b/kipi-plugins/findimages/Makefile.am
@@ -13,7 +13,7 @@ kipiplugin_findimages_la_SOURCES = plugin_findimages.cpp displaycompare.cpp \
 				   fuzzycompare.cpp fastcompare.cpp actions.cpp
 
 # Libs needed by the plugin
-kipiplugin_findimages_la_LIBADD = -lkdefx $(LIBKIPI_LIBS) $(LIB_KIO) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT)
+kipiplugin_findimages_la_LIBADD = -ltdefx $(LIBKIPI_LIBS) $(LIB_KIO) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT)
 
 # LD flags for the plugin
 kipiplugin_findimages_la_LDFLAGS = $(KIPI_PLUGINS_COMMON_LDFLAGS) -module $(KDE_PLUGIN) $(all_libraries) -lkipiplugins
diff --git a/kipi-plugins/kipiplugins.kdevelop b/kipi-plugins/kipiplugins.kdevelop
index 832d565..404e2c9 100644
--- a/kipi-plugins/kipiplugins.kdevelop
+++ b/kipi-plugins/kipiplugins.kdevelop
@@ -121,7 +121,7 @@
       <globalcwd/>
       <useglobalprogram>true</useglobalprogram>
       <autoinstall>false</autoinstall>
-      <autokdesu>false</autokdesu>
+      <autotdesu>false</autotdesu>
     </run>
     <general>
       <useconfiguration>default</useconfiguration>
diff --git a/kipi-plugins/slideshow/Makefile.am b/kipi-plugins/slideshow/Makefile.am
index 9982df4..f35f8b8 100644
--- a/kipi-plugins/slideshow/Makefile.am
+++ b/kipi-plugins/slideshow/Makefile.am
@@ -13,8 +13,8 @@ kipiplugin_slideshow_la_SOURCES = listimageitems.cpp plugin_slideshow.cpp \
 	slideshowloader.cpp toolbar.cpp imageloadthread.cpp kbeffect.cpp screenproperties.cpp \
 	slideshowkb.cpp
 
-#kipiplugin_slideshow_la_LIBADD = -lkdefx  $(GL_LIBS) $(LIBKIPI_LIBS) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT)
-kipiplugin_slideshow_la_LIBADD = -lkdefx -lXrandr $(GL_LIBS) $(LIBKIPI_LIBS) $(LIBKDCRAW_LIBS)  \
+#kipiplugin_slideshow_la_LIBADD = -ltdefx  $(GL_LIBS) $(LIBKIPI_LIBS) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT)
+kipiplugin_slideshow_la_LIBADD = -ltdefx -lXrandr $(GL_LIBS) $(LIBKIPI_LIBS) $(LIBKDCRAW_LIBS)  \
 	                         $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_KIO) $(LIB_QT)
 
 kipiplugin_slideshow_la_LDFLAGS = $(KIPI_PLUGINS_COMMON_LDFLAGS) -module $(KDE_PLUGIN) $(all_libraries) -lkipiplugins
diff --git a/po/lt/kipiplugin_batchprocessimages.po b/po/lt/kipiplugin_batchprocessimages.po
index 8f54019..9610707 100644
--- a/po/lt/kipiplugin_batchprocessimages.po
+++ b/po/lt/kipiplugin_batchprocessimages.po
@@ -751,7 +751,7 @@ msgstr ""
 "Nėra\n"
 "#-#-#-#-#  cupsdconf.po (cupsdconf)  #-#-#-#-#\n"
 "Nėra\n"
-"#-#-#-#-#  kdeprint.po (kdeprint)  #-#-#-#-#\n"
+"#-#-#-#-#  tdeprint.po (tdeprint)  #-#-#-#-#\n"
 "Nieko\n"
 "#-#-#-#-#  kio.po (kio)  #-#-#-#-#\n"
 "Nieko\n"
diff --git a/po/lt/kipiplugin_calendar.po b/po/lt/kipiplugin_calendar.po
index 750a9c8..947e056 100644
--- a/po/lt/kipiplugin_calendar.po
+++ b/po/lt/kipiplugin_calendar.po
@@ -70,7 +70,7 @@ msgstr ""
 "Nustatymai\n"
 "#-#-#-#-#  libkickermenu_prefmenu.po (libkickermenu_prefmenu)  #-#-#-#-#\n"
 "Nustatymai\n"
-"#-#-#-#-#  kdeprint.po (kdeprint)  #-#-#-#-#\n"
+"#-#-#-#-#  tdeprint.po (tdeprint)  #-#-#-#-#\n"
 "Nustatymai\n"
 "#-#-#-#-#  digikamimageplugin_border.po (digikamimageplugin_border)  #-#-#-#-#\n"
 "Nustatymai\n"
diff --git a/po/lt/kipiplugin_rawconverter.po b/po/lt/kipiplugin_rawconverter.po
index edf3430..42761ff 100644
--- a/po/lt/kipiplugin_rawconverter.po
+++ b/po/lt/kipiplugin_rawconverter.po
@@ -76,7 +76,7 @@ msgstr ""
 #, fuzzy
 msgid "&Abort"
 msgstr ""
-"#-#-#-#-#  kdeprint.po (kdeprint)  #-#-#-#-#\n"
+"#-#-#-#-#  tdeprint.po (tdeprint)  #-#-#-#-#\n"
 "&Nutraukti\n"
 "#-#-#-#-#  kdelibs.po (kdelibs)  #-#-#-#-#\n"
 "&Nutraukti\n"
@@ -127,7 +127,7 @@ msgstr ""
 "Nustatymai\n"
 "#-#-#-#-#  libkickermenu_prefmenu.po (libkickermenu_prefmenu)  #-#-#-#-#\n"
 "Nustatymai\n"
-"#-#-#-#-#  kdeprint.po (kdeprint)  #-#-#-#-#\n"
+"#-#-#-#-#  tdeprint.po (tdeprint)  #-#-#-#-#\n"
 "Nustatymai\n"
 "#-#-#-#-#  digikamimageplugin_border.po (digikamimageplugin_border)  #-#-#-#-#\n"
 "Nustatymai\n"
diff --git a/po/lt/kipiplugin_slideshow.po b/po/lt/kipiplugin_slideshow.po
index 3526129..b06b1dc 100644
--- a/po/lt/kipiplugin_slideshow.po
+++ b/po/lt/kipiplugin_slideshow.po
@@ -139,7 +139,7 @@ msgstr ""
 "Nėra\n"
 "#-#-#-#-#  cupsdconf.po (cupsdconf)  #-#-#-#-#\n"
 "Nėra\n"
-"#-#-#-#-#  kdeprint.po (kdeprint)  #-#-#-#-#\n"
+"#-#-#-#-#  tdeprint.po (tdeprint)  #-#-#-#-#\n"
 "Nieko\n"
 "#-#-#-#-#  kio.po (kio)  #-#-#-#-#\n"
 "Nieko\n"