diff --git a/acinclude.m4 b/acinclude.m4
index 21fd6ca..9fe7b24 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
@@ -2064,12 +2064,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")
@@ -2078,9 +2078,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")
@@ -2089,8 +2089,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")
@@ -2099,10 +2099,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)")
@@ -2489,7 +2489,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/config.log b/config.log
index ef422e0..02a010d 100644
--- a/config.log
+++ b/config.log
@@ -319,7 +319,7 @@ kde_styledir=''
 kde_templatesdir=''
 kde_wallpaperdir=''
 kde_widgetdir=''
-kdeinitdir=''
+tdeinitdir=''
 libdir='${exec_prefix}/lib'
 libexecdir='${exec_prefix}/libexec'
 localedir='${datarootdir}/locale'
diff --git a/kdiff3plugin/kdiff3plugin.cpp b/kdiff3plugin/kdiff3plugin.cpp
index 3cc6cea..53360b6 100755
--- a/kdiff3plugin/kdiff3plugin.cpp
+++ b/kdiff3plugin/kdiff3plugin.cpp
@@ -165,7 +165,7 @@ void KDiff3Plugin::slotCompareWith()
       TQStringList args;
       args << s_pHistory->front();
       args << m_list.front();
-      kapp->kdeinitExec ("kdiff3", args);
+      kapp->tdeinitExec ("kdiff3", args);
    }
 }
 
@@ -177,7 +177,7 @@ void KDiff3Plugin::slotCompareWithHistoryItem()
       TQStringList args;
       args << pAction->text();
       args << m_list.front();
-      kapp->kdeinitExec ("kdiff3", args);
+      kapp->tdeinitExec ("kdiff3", args);
    }
 }
 
@@ -188,7 +188,7 @@ void KDiff3Plugin::slotCompareTwoFiles()
       TQStringList args;
       args << m_list.front();
       args << m_list.back();
-      kapp->kdeinitExec ("kdiff3", args);
+      kapp->tdeinitExec ("kdiff3", args);
    }
 }
 
@@ -200,7 +200,7 @@ void KDiff3Plugin::slotCompareThreeFiles()
       args << m_list[0];
       args << m_list[1];
       args << m_list[2];
-      kapp->kdeinitExec ("kdiff3", args);
+      kapp->tdeinitExec ("kdiff3", args);
    }
 }
 
@@ -212,7 +212,7 @@ void KDiff3Plugin::slotMergeWith()
       args << s_pHistory->front();
       args << m_list.front();
       args << ( "-o" + m_list.front() );
-      kapp->kdeinitExec ("kdiff3", args);
+      kapp->tdeinitExec ("kdiff3", args);
    }
 }
 
@@ -225,7 +225,7 @@ void KDiff3Plugin::slotMergeThreeWay()
       args << (*s_pHistory)[0];
       args << m_list.front();
       args << ("-o" + m_list.front());
-      kapp->kdeinitExec ("kdiff3", args);
+      kapp->tdeinitExec ("kdiff3", args);
    }
 }
 
diff --git a/kdiff3plugin/po/Makefile b/kdiff3plugin/po/Makefile
index 0a8b883..3e6e26a 100644
--- a/kdiff3plugin/po/Makefile
+++ b/kdiff3plugin/po/Makefile
@@ -140,11 +140,11 @@ LIBUTIL = -lutil
 LIBZ = -lz
 LIB_KAB = -lkab
 LIB_KABC = -lkabc
-LIB_KDECORE = -lkdecore
+LIB_KDECORE = -ltdecore
 LIB_KDED = 
-LIB_KDEPIM = -lkdepim
-LIB_KDEPRINT = -lkdeprint
-LIB_KDEUI = -lkdeui
+LIB_KDEPIM = -ltdepim
+LIB_KDEPRINT = -ltdeprint
+LIB_KDEUI = -ltdeui
 LIB_KDNSSD = -lkdnssd
 LIB_KFILE = -lkio
 LIB_KFM = 
@@ -271,7 +271,7 @@ kde_styledir = ${libdir}/trinity/plugins/styles
 kde_templatesdir = ${datadir}/templates
 kde_wallpaperdir = ${datadir}/wallpapers
 kde_widgetdir = /usr/lib/trinity/plugins/designer
-kdeinitdir = $(kde_moduledir)
+tdeinitdir = $(kde_moduledir)
 libdir = ${exec_prefix}/lib
 libexecdir = ${exec_prefix}/libexec
 localedir = ${datarootdir}/locale
diff --git a/po/lt.po b/po/lt.po
index a0059f1..bbe9b07 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -137,7 +137,7 @@ msgstr ""
 "Pavadinimas\n"
 "#-#-#-#-#  kfindpart.po (kfindpart)  #-#-#-#-#\n"
 "Pavadinimas\n"
-"#-#-#-#-#  kdeprint.po (kdeprint)  #-#-#-#-#\n"
+"#-#-#-#-#  tdeprint.po (tdeprint)  #-#-#-#-#\n"
 "Vardas\n"
 "#-#-#-#-#  kio.po (kio)  #-#-#-#-#\n"
 "Vardas\n"
@@ -1531,7 +1531,7 @@ msgstr ""
 #, fuzzy
 msgid "Output"
 msgstr ""
-"#-#-#-#-#  kdeprint.po (kdeprint)  #-#-#-#-#\n"
+"#-#-#-#-#  tdeprint.po (tdeprint)  #-#-#-#-#\n"
 "Išvedimas\n"
 "#-#-#-#-#  kbabel.po (kbabel)  #-#-#-#-#\n"
 "Išvestis"
diff --git a/src/Makefile.am b/src/Makefile.am
index 3da9b63..cd177e1 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -25,7 +25,7 @@ bin_PROGRAMS = kdiff3
 
 # the application source, library search path, and link libraries
 kdiff3_SOURCES = main.cpp kdiff3_shell.cpp
-kdiff3_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+kdiff3_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 kdiff3_LDADD   = $(LIB_KPARTS)
 
 # this is where the desktop file will go