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/digikam/imageplugins/adjustcurves/Makefile.am b/digikam/imageplugins/adjustcurves/Makefile.am
index 4b6b0d8..b60deff 100644
--- a/digikam/imageplugins/adjustcurves/Makefile.am
+++ b/digikam/imageplugins/adjustcurves/Makefile.am
@@ -23,7 +23,7 @@ digikamimageplugin_adjustcurves_la_SOURCES = imageplugin_adjustcurves.cpp \
 digikamimageplugin_adjustcurves_la_LIBADD = $(LIB_KPARTS) \
 	                                        $(top_builddir)/digikam/digikam/libdigikam.la
 
-digikamimageplugin_adjustcurves_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkdefx -lkdcraw -lkio
+digikamimageplugin_adjustcurves_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -ltdefx -lkdcraw -lkio
 
 kde_services_DATA = digikamimageplugin_adjustcurves.desktop
 
diff --git a/digikam/imageplugins/adjustlevels/Makefile.am b/digikam/imageplugins/adjustlevels/Makefile.am
index 1877e01..38f877d 100644
--- a/digikam/imageplugins/adjustlevels/Makefile.am
+++ b/digikam/imageplugins/adjustlevels/Makefile.am
@@ -23,7 +23,7 @@ digikamimageplugin_adjustlevels_la_SOURCES = imageplugin_adjustlevels.cpp \
 digikamimageplugin_adjustlevels_la_LIBADD = $(LIB_KPARTS) \
 	                                        $(top_builddir)/digikam/digikam/libdigikam.la 
 
-digikamimageplugin_adjustlevels_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkdefx -lkdcraw -lkio
+digikamimageplugin_adjustlevels_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -ltdefx -lkdcraw -lkio
 
 kde_services_DATA = digikamimageplugin_adjustlevels.desktop
 
diff --git a/digikam/imageplugins/antivignetting/Makefile.am b/digikam/imageplugins/antivignetting/Makefile.am
index 9b5141f..7de076a 100644
--- a/digikam/imageplugins/antivignetting/Makefile.am
+++ b/digikam/imageplugins/antivignetting/Makefile.am
@@ -23,7 +23,7 @@ digikamimageplugin_antivignetting_la_SOURCES = imageplugin_antivignetting.cpp \
 digikamimageplugin_antivignetting_la_LIBADD = $(LIB_KPARTS) \
 	                                          $(top_builddir)/digikam/digikam/libdigikam.la 
 
-digikamimageplugin_antivignetting_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkdefx -lkdcraw -lkio
+digikamimageplugin_antivignetting_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -ltdefx -lkdcraw -lkio
 
 kde_services_DATA = digikamimageplugin_antivignetting.desktop
 
diff --git a/digikam/imageplugins/blurfx/Makefile.am b/digikam/imageplugins/blurfx/Makefile.am
index 2e6e8f4..b659cf5 100644
--- a/digikam/imageplugins/blurfx/Makefile.am
+++ b/digikam/imageplugins/blurfx/Makefile.am
@@ -23,7 +23,7 @@ digikamimageplugin_blurfx_la_SOURCES = imageplugin_blurfx.cpp \
 digikamimageplugin_blurfx_la_LIBADD = $(LIB_KPARTS) \
 	                                  $(top_builddir)/digikam/digikam/libdigikam.la 
 
-digikamimageplugin_blurfx_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkdefx -lkdcraw -lkio
+digikamimageplugin_blurfx_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -ltdefx -lkdcraw -lkio
 
 kde_services_DATA = digikamimageplugin_blurfx.desktop
 
diff --git a/digikam/imageplugins/border/Makefile.am b/digikam/imageplugins/border/Makefile.am
index 016f0d3..9eb8140 100644
--- a/digikam/imageplugins/border/Makefile.am
+++ b/digikam/imageplugins/border/Makefile.am
@@ -24,7 +24,7 @@ digikamimageplugin_border_la_SOURCES = imageplugin_border.cpp \
 digikamimageplugin_border_la_LIBADD = $(LIB_KPARTS) \
 	                                  $(top_builddir)/digikam/digikam/libdigikam.la 
 
-digikamimageplugin_border_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkdefx -lkdcraw -lkio
+digikamimageplugin_border_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -ltdefx -lkdcraw -lkio
 
 kde_services_DATA = digikamimageplugin_border.desktop
 
diff --git a/digikam/imageplugins/channelmixer/Makefile.am b/digikam/imageplugins/channelmixer/Makefile.am
index 4e83cf2..fdb2ed5 100644
--- a/digikam/imageplugins/channelmixer/Makefile.am
+++ b/digikam/imageplugins/channelmixer/Makefile.am
@@ -23,7 +23,7 @@ digikamimageplugin_channelmixer_la_SOURCES = imageplugin_channelmixer.cpp \
 digikamimageplugin_channelmixer_la_LIBADD = $(LIB_KPARTS) \
 	                                        $(top_builddir)/digikam/digikam/libdigikam.la 
 
-digikamimageplugin_channelmixer_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkdefx -lkdcraw -lkio
+digikamimageplugin_channelmixer_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -ltdefx -lkdcraw -lkio
 
 kde_services_DATA = digikamimageplugin_channelmixer.desktop
 
diff --git a/digikam/imageplugins/charcoal/Makefile.am b/digikam/imageplugins/charcoal/Makefile.am
index d767acb..8f5b4a7 100644
--- a/digikam/imageplugins/charcoal/Makefile.am
+++ b/digikam/imageplugins/charcoal/Makefile.am
@@ -23,7 +23,7 @@ digikamimageplugin_charcoal_la_SOURCES = imageplugin_charcoal.cpp \
 digikamimageplugin_charcoal_la_LIBADD = $(LIB_KPARTS) \
 	                                    $(top_builddir)/digikam/digikam/libdigikam.la
 
-digikamimageplugin_charcoal_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkdefx -lkdcraw -lkio
+digikamimageplugin_charcoal_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -ltdefx -lkdcraw -lkio
 
 kde_services_DATA = digikamimageplugin_charcoal.desktop
 
diff --git a/digikam/imageplugins/colorfx/Makefile.am b/digikam/imageplugins/colorfx/Makefile.am
index 0fe571f..a5749f3 100644
--- a/digikam/imageplugins/colorfx/Makefile.am
+++ b/digikam/imageplugins/colorfx/Makefile.am
@@ -23,7 +23,7 @@ digikamimageplugin_colorfx_la_SOURCES = imageplugin_colorfx.cpp \
 digikamimageplugin_colorfx_la_LIBADD = $(LIB_KPARTS) \
 	                                   $(top_builddir)/digikam/digikam/libdigikam.la 
 
-digikamimageplugin_colorfx_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkdefx -lkdcraw -lkio
+digikamimageplugin_colorfx_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -ltdefx -lkdcraw -lkio
 
 kde_services_DATA = digikamimageplugin_colorfx.desktop
 
diff --git a/digikam/imageplugins/coreplugin/Makefile.am b/digikam/imageplugins/coreplugin/Makefile.am
index 5f367f9..2b7c12f 100644
--- a/digikam/imageplugins/coreplugin/Makefile.am
+++ b/digikam/imageplugins/coreplugin/Makefile.am
@@ -42,7 +42,7 @@ digikamimageplugin_core_la_LIBADD = $(LIB_KPARTS) \
 				    $(top_builddir)/digikam/libs/widgets/common/libcommonwidgets.la \
 				    $(top_builddir)/digikam/libs/widgets/imageplugins/libimagepluginswidgets.la
 
-digikamimageplugin_core_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkdefx -lkdcraw -lkio -lkexiv2 -lkutils
+digikamimageplugin_core_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -ltdefx -lkdcraw -lkio -lkexiv2 -lkutils
 
 kde_services_DATA = digikamimageplugin_core.desktop
 
diff --git a/digikam/imageplugins/distortionfx/Makefile.am b/digikam/imageplugins/distortionfx/Makefile.am
index 04e348e..942cf98 100644
--- a/digikam/imageplugins/distortionfx/Makefile.am
+++ b/digikam/imageplugins/distortionfx/Makefile.am
@@ -23,7 +23,7 @@ digikamimageplugin_distortionfx_la_SOURCES = imageplugin_distortionfx.cpp \
 digikamimageplugin_distortionfx_la_LIBADD = $(LIB_KPARTS) \
 	                                        $(top_builddir)/digikam/digikam/libdigikam.la
 
-digikamimageplugin_distortionfx_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkdefx -lkdcraw -lkio
+digikamimageplugin_distortionfx_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -ltdefx -lkdcraw -lkio
 
 kde_services_DATA = digikamimageplugin_distortionfx.desktop
 
diff --git a/digikam/imageplugins/emboss/Makefile.am b/digikam/imageplugins/emboss/Makefile.am
index 44d882f..cfbc4a0 100644
--- a/digikam/imageplugins/emboss/Makefile.am
+++ b/digikam/imageplugins/emboss/Makefile.am
@@ -23,7 +23,7 @@ digikamimageplugin_emboss_la_SOURCES = imageplugin_emboss.cpp \
 digikamimageplugin_emboss_la_LIBADD = $(LIB_KPARTS) \
 	                                  $(top_builddir)/digikam/digikam/libdigikam.la 
 
-digikamimageplugin_emboss_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkdefx -lkdcraw -lkio
+digikamimageplugin_emboss_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -ltdefx -lkdcraw -lkio
 
 kde_services_DATA = digikamimageplugin_emboss.desktop
 
diff --git a/digikam/imageplugins/filmgrain/Makefile.am b/digikam/imageplugins/filmgrain/Makefile.am
index ae78cc1..42c9ae5 100644
--- a/digikam/imageplugins/filmgrain/Makefile.am
+++ b/digikam/imageplugins/filmgrain/Makefile.am
@@ -23,7 +23,7 @@ digikamimageplugin_filmgrain_la_SOURCES = imageplugin_filmgrain.cpp \
 digikamimageplugin_filmgrain_la_LIBADD = $(LIB_KPARTS) \
 	                                     $(top_builddir)/digikam/digikam/libdigikam.la 
 
-digikamimageplugin_filmgrain_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkdefx -lkdcraw -lkio
+digikamimageplugin_filmgrain_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -ltdefx -lkdcraw -lkio
 
 kde_services_DATA = digikamimageplugin_filmgrain.desktop
 
diff --git a/digikam/imageplugins/freerotation/Makefile.am b/digikam/imageplugins/freerotation/Makefile.am
index e20b3b6..13109b8 100644
--- a/digikam/imageplugins/freerotation/Makefile.am
+++ b/digikam/imageplugins/freerotation/Makefile.am
@@ -23,7 +23,7 @@ digikamimageplugin_freerotation_la_SOURCES = imageplugin_freerotation.cpp \
 digikamimageplugin_freerotation_la_LIBADD = $(LIB_KPARTS) \
 	                                        $(top_builddir)/digikam/digikam/libdigikam.la 
 
-digikamimageplugin_freerotation_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkdefx -lkdcraw -lkio
+digikamimageplugin_freerotation_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -ltdefx -lkdcraw -lkio
 
 kde_services_DATA = digikamimageplugin_freerotation.desktop
 
diff --git a/digikam/imageplugins/hotpixels/Makefile.am b/digikam/imageplugins/hotpixels/Makefile.am
index ea7e658..089678d 100644
--- a/digikam/imageplugins/hotpixels/Makefile.am
+++ b/digikam/imageplugins/hotpixels/Makefile.am
@@ -25,7 +25,7 @@ digikamimageplugin_hotpixels_la_SOURCES = blackframeparser.cpp weights.cpp \
 digikamimageplugin_hotpixels_la_LIBADD = $(LIB_KPARTS) \
 	                                     $(top_builddir)/digikam/digikam/libdigikam.la 
 
-digikamimageplugin_hotpixels_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkdefx -lkdcraw -lkio
+digikamimageplugin_hotpixels_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -ltdefx -lkdcraw -lkio
 
 kde_services_DATA = digikamimageplugin_hotpixels.desktop
 
diff --git a/digikam/imageplugins/infrared/Makefile.am b/digikam/imageplugins/infrared/Makefile.am
index 0c7af9c..23e1dc1 100644
--- a/digikam/imageplugins/infrared/Makefile.am
+++ b/digikam/imageplugins/infrared/Makefile.am
@@ -23,7 +23,7 @@ digikamimageplugin_infrared_la_SOURCES = imageplugin_infrared.cpp \
 digikamimageplugin_infrared_la_LIBADD = $(LIB_KPARTS) \
 	                                    $(top_builddir)/digikam/digikam/libdigikam.la
 
-digikamimageplugin_infrared_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkdefx -lkdcraw -lkio
+digikamimageplugin_infrared_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -ltdefx -lkdcraw -lkio
 
 kde_services_DATA = digikamimageplugin_infrared.desktop
 
diff --git a/digikam/imageplugins/inpainting/Makefile.am b/digikam/imageplugins/inpainting/Makefile.am
index 9ae30bb..ef3badd 100644
--- a/digikam/imageplugins/inpainting/Makefile.am
+++ b/digikam/imageplugins/inpainting/Makefile.am
@@ -24,7 +24,7 @@ digikamimageplugin_inpainting_la_SOURCES = imageplugin_inpainting.cpp \
 digikamimageplugin_inpainting_la_LIBADD = $(LIB_KPARTS) \
 	                                      $(top_builddir)/digikam/digikam/libdigikam.la  
 
-digikamimageplugin_inpainting_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -no-undefined -lkdecore -lkdeui $(LIB_QT) -lkdefx -lkdcraw -lkio
+digikamimageplugin_inpainting_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -no-undefined -ltdecore -ltdeui $(LIB_QT) -ltdefx -lkdcraw -lkio
 
 kde_services_DATA = digikamimageplugin_inpainting.desktop
 
diff --git a/digikam/imageplugins/inserttext/Makefile.am b/digikam/imageplugins/inserttext/Makefile.am
index e10134a..41422a1 100644
--- a/digikam/imageplugins/inserttext/Makefile.am
+++ b/digikam/imageplugins/inserttext/Makefile.am
@@ -23,7 +23,7 @@ digikamimageplugin_inserttext_la_SOURCES = imageplugin_inserttext.cpp inserttext
 digikamimageplugin_inserttext_la_LIBADD = $(LIB_KPARTS) \
 	                                      $(top_builddir)/digikam/digikam/libdigikam.la 
 
-digikamimageplugin_inserttext_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkdefx -lkdcraw -lkio
+digikamimageplugin_inserttext_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -ltdefx -lkdcraw -lkio
 
 kde_services_DATA = digikamimageplugin_inserttext.desktop
 
diff --git a/digikam/imageplugins/lensdistortion/Makefile.am b/digikam/imageplugins/lensdistortion/Makefile.am
index 9fec75b..99c2709 100644
--- a/digikam/imageplugins/lensdistortion/Makefile.am
+++ b/digikam/imageplugins/lensdistortion/Makefile.am
@@ -24,7 +24,7 @@ digikamimageplugin_lensdistortion_la_SOURCES = imageplugin_lensdistortion.cpp \
 digikamimageplugin_lensdistortion_la_LIBADD = $(LIB_KPARTS) \
 	                                          $(top_builddir)/digikam/digikam/libdigikam.la 
 
-digikamimageplugin_lensdistortion_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkdefx -lkdcraw -lkio
+digikamimageplugin_lensdistortion_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -ltdefx -lkdcraw -lkio
 
 kde_services_DATA = digikamimageplugin_lensdistortion.desktop
 
diff --git a/digikam/imageplugins/noisereduction/Makefile.am b/digikam/imageplugins/noisereduction/Makefile.am
index 9dadc7a..7ff8cb0 100644
--- a/digikam/imageplugins/noisereduction/Makefile.am
+++ b/digikam/imageplugins/noisereduction/Makefile.am
@@ -23,7 +23,7 @@ digikamimageplugin_noisereduction_la_SOURCES = imageplugin_noisereduction.cpp \
 digikamimageplugin_noisereduction_la_LIBADD = $(LIB_KPARTS) \
 	                                          $(top_builddir)/digikam/digikam/libdigikam.la 
 
-digikamimageplugin_noisereduction_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkdefx -lkdcraw -lkio
+digikamimageplugin_noisereduction_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -ltdefx -lkdcraw -lkio
 
 kde_services_DATA = digikamimageplugin_noisereduction.desktop
 
diff --git a/digikam/imageplugins/oilpaint/Makefile.am b/digikam/imageplugins/oilpaint/Makefile.am
index 5a5c862..65b8999 100644
--- a/digikam/imageplugins/oilpaint/Makefile.am
+++ b/digikam/imageplugins/oilpaint/Makefile.am
@@ -23,7 +23,7 @@ digikamimageplugin_oilpaint_la_SOURCES = imageplugin_oilpaint.cpp \
 digikamimageplugin_oilpaint_la_LIBADD = $(LIB_KPARTS) \
 	                                    $(top_builddir)/digikam/digikam/libdigikam.la 
 
-digikamimageplugin_oilpaint_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkdefx -lkdcraw -lkio
+digikamimageplugin_oilpaint_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -ltdefx -lkdcraw -lkio
 
 kde_services_DATA = digikamimageplugin_oilpaint.desktop
 
diff --git a/digikam/imageplugins/perspective/Makefile.am b/digikam/imageplugins/perspective/Makefile.am
index 5264df6..c7b0222 100644
--- a/digikam/imageplugins/perspective/Makefile.am
+++ b/digikam/imageplugins/perspective/Makefile.am
@@ -24,7 +24,7 @@ digikamimageplugin_perspective_la_SOURCES = imageplugin_perspective.cpp \
 digikamimageplugin_perspective_la_LIBADD = $(LIB_KPARTS) \
 	                                       $(top_builddir)/digikam/digikam/libdigikam.la 
 	
-digikamimageplugin_perspective_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkdefx -lkdcraw -lkio
+digikamimageplugin_perspective_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -ltdefx -lkdcraw -lkio
 
 kde_services_DATA = digikamimageplugin_perspective.desktop
 
diff --git a/digikam/imageplugins/raindrop/Makefile.am b/digikam/imageplugins/raindrop/Makefile.am
index 08bdcb7..56f08e1 100644
--- a/digikam/imageplugins/raindrop/Makefile.am
+++ b/digikam/imageplugins/raindrop/Makefile.am
@@ -23,7 +23,7 @@ digikamimageplugin_raindrop_la_SOURCES = imageplugin_raindrop.cpp \
 digikamimageplugin_raindrop_la_LIBADD = $(LIB_KPARTS) \
 	                                    $(top_builddir)/digikam/digikam/libdigikam.la
 
-digikamimageplugin_raindrop_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkdefx -lkdcraw -lkio
+digikamimageplugin_raindrop_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -ltdefx -lkdcraw -lkio
 
 kde_services_DATA = digikamimageplugin_raindrop.desktop
 
diff --git a/digikam/imageplugins/restoration/Makefile.am b/digikam/imageplugins/restoration/Makefile.am
index 9b61742..d75539f 100644
--- a/digikam/imageplugins/restoration/Makefile.am
+++ b/digikam/imageplugins/restoration/Makefile.am
@@ -24,7 +24,7 @@ digikamimageplugin_restoration_la_SOURCES = imageplugin_restoration.cpp \
 digikamimageplugin_restoration_la_LIBADD = $(LIB_KPARTS) \
 	                                       $(top_builddir)/digikam/digikam/libdigikam.la 
 
-digikamimageplugin_restoration_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -no-undefined -lkdecore -lkdeui $(LIB_QT) -lkdefx -lkdcraw -lkio
+digikamimageplugin_restoration_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -no-undefined -ltdecore -ltdeui $(LIB_QT) -ltdefx -lkdcraw -lkio
 
 kde_services_DATA = digikamimageplugin_restoration.desktop
 
diff --git a/digikam/imageplugins/sheartool/Makefile.am b/digikam/imageplugins/sheartool/Makefile.am
index 4fa368d..1e10853 100644
--- a/digikam/imageplugins/sheartool/Makefile.am
+++ b/digikam/imageplugins/sheartool/Makefile.am
@@ -23,7 +23,7 @@ digikamimageplugin_sheartool_la_SOURCES = imageplugin_sheartool.cpp shear.cpp \
 digikamimageplugin_sheartool_la_LIBADD = $(LIB_KPARTS) \
 	                                     $(top_builddir)/digikam/digikam/libdigikam.la 
 
-digikamimageplugin_sheartool_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkdefx -lkdcraw -lkio
+digikamimageplugin_sheartool_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -ltdefx -lkdcraw -lkio
 
 kde_services_DATA = digikamimageplugin_sheartool.desktop
 
diff --git a/digikam/imageplugins/superimpose/Makefile.am b/digikam/imageplugins/superimpose/Makefile.am
index d33dca1..149e675 100644
--- a/digikam/imageplugins/superimpose/Makefile.am
+++ b/digikam/imageplugins/superimpose/Makefile.am
@@ -25,7 +25,7 @@ digikamimageplugin_superimpose_la_SOURCES = superimposewidget.cpp superimpose.cp
 digikamimageplugin_superimpose_la_LIBADD = $(LIB_KPARTS) \
 	                                       $(top_builddir)/digikam/digikam/libdigikam.la 
 
-digikamimageplugin_superimpose_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkdefx -lkdcraw -lkio
+digikamimageplugin_superimpose_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -ltdefx -lkdcraw -lkio
 
 kde_services_DATA = digikamimageplugin_superimpose.desktop
 
diff --git a/digikam/imageplugins/texture/Makefile.am b/digikam/imageplugins/texture/Makefile.am
index 52fab22..8bdf424 100644
--- a/digikam/imageplugins/texture/Makefile.am
+++ b/digikam/imageplugins/texture/Makefile.am
@@ -24,7 +24,7 @@ digikamimageplugin_texture_la_SOURCES = imageplugin_texture.cpp \
 digikamimageplugin_texture_la_LIBADD = $(LIB_KPARTS) \
 	                                   $(top_builddir)/digikam/digikam/libdigikam.la  
 
-digikamimageplugin_texture_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkdefx -lkdcraw -lkio
+digikamimageplugin_texture_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -ltdefx -lkdcraw -lkio
 
 kde_services_DATA = digikamimageplugin_texture.desktop
 
diff --git a/digikam/imageplugins/whitebalance/Makefile.am b/digikam/imageplugins/whitebalance/Makefile.am
index 5a6b830..a0275a1 100644
--- a/digikam/imageplugins/whitebalance/Makefile.am
+++ b/digikam/imageplugins/whitebalance/Makefile.am
@@ -23,7 +23,7 @@ digikamimageplugin_whitebalance_la_SOURCES = imageplugin_whitebalance.cpp \
 digikamimageplugin_whitebalance_la_LIBADD = $(LIB_KPARTS) \
 	                                        $(top_builddir)/digikam/digikam/libdigikam.la  
 
-digikamimageplugin_whitebalance_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkdefx -lkdcraw -lkio
+digikamimageplugin_whitebalance_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -ltdefx -lkdcraw -lkio
 
 kde_services_DATA = digikamimageplugin_whitebalance.desktop
 
diff --git a/digikam/kioslave/Makefile.am b/digikam/kioslave/Makefile.am
index 163ca4c..36a4c59 100644
--- a/digikam/kioslave/Makefile.am
+++ b/digikam/kioslave/Makefile.am
@@ -34,7 +34,7 @@ kio_digikamthumbnail_la_LIBADD  = $(LIB_KIO) $(LIBJPEG) $(LIBPNG) \
 	                              $(top_builddir)/digikam/libs/jpegutils/libjpegutils.la \
 	                              $(top_builddir)/digikam/libs/dimg/libdimg.la
 
-kio_digikamthumbnail_la_LDFLAGS = -module -avoid-version $(KDE_PLUGIN) $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkdefx
+kio_digikamthumbnail_la_LDFLAGS = -module -avoid-version $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -ltdefx
 
 # -- digikam tags KIO --------------------------------------------------------------
 
@@ -42,7 +42,7 @@ kio_digikamtags_la_SOURCES = digikamtags.cpp sqlitedb.cpp
 
 kio_digikamtags_la_LIBADD  = $(LIB_KIO) $(LIB_SQLITE3) $(LIB_SQLITE3_LOCAL) 
 
-kio_digikamtags_la_LDFLAGS = -module -avoid-version $(all_libraries) $(KDE_PLUGIN) -lkdecore -lkdeui $(LIB_QT) -lkdefx
+kio_digikamtags_la_LDFLAGS = -module -avoid-version $(all_libraries) $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -ltdefx
 
 # -- digikam albums KIO ------------------------------------------------------------
 
@@ -53,7 +53,7 @@ kio_digikamalbums_la_LIBADD  = $(top_builddir)/digikam/libs/jpegutils/libjpeguti
 	                           $(LIB_KIO) $(LIB_SQLITE3) $(LIB_SQLITE3_LOCAL) 
 
 
-kio_digikamalbums_la_LDFLAGS = -module -avoid-version $(all_libraries) $(KDE_PLUGIN) -lkdecore -lkdeui $(LIB_QT) -lkdefx
+kio_digikamalbums_la_LDFLAGS = -module -avoid-version $(all_libraries) $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -ltdefx
 
 # -- digikam dates KIO -------------------------------------------------------------
 
@@ -61,7 +61,7 @@ kio_digikamdates_la_SOURCES = digikamdates.cpp sqlitedb.cpp
 
 kio_digikamdates_la_LIBADD  = $(LIB_KIO) $(LIB_SQLITE3) $(LIB_SQLITE3_LOCAL) 
 
-kio_digikamdates_la_LDFLAGS = -module -avoid-version $(all_libraries) $(KDE_PLUGIN) -lkdecore -lkdeui $(LIB_QT) -lkdefx
+kio_digikamdates_la_LDFLAGS = -module -avoid-version $(all_libraries) $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -ltdefx
 
 # -- digikam search KIO ------------------------------------------------------------
 
@@ -69,4 +69,4 @@ kio_digikamsearch_la_SOURCES = digikamsearch.cpp sqlitedb.cpp
 
 kio_digikamsearch_la_LIBADD  = $(LIB_KIO) $(LIB_SQLITE3) $(LIB_SQLITE3_LOCAL) 
 
-kio_digikamsearch_la_LDFLAGS = -module -avoid-version $(all_libraries) $(KDE_PLUGIN) -lkdecore -lkdeui $(LIB_QT) -lkdefx
+kio_digikamsearch_la_LDFLAGS = -module -avoid-version $(all_libraries) $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -ltdefx
diff --git a/digikam/libs/curves/Makefile.am b/digikam/libs/curves/Makefile.am
index d72cf26..37d20c2 100644
--- a/digikam/libs/curves/Makefile.am
+++ b/digikam/libs/curves/Makefile.am
@@ -4,7 +4,7 @@ noinst_LTLIBRARIES = libcurves.la
 
 libcurves_la_SOURCES = imagecurves.cpp 
 
-libcurves_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+libcurves_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 
 INCLUDES = -I$(top_srcdir)/digikam/libs/histogram \
 	       -I$(top_srcdir)/digikam/libs/dimg \
diff --git a/digikam/libs/dialogs/Makefile.am b/digikam/libs/dialogs/Makefile.am
index b056245..48148fc 100644
--- a/digikam/libs/dialogs/Makefile.am
+++ b/digikam/libs/dialogs/Makefile.am
@@ -6,14 +6,14 @@ noinst_LTLIBRARIES = libdialog.la libdialogshowfoto.la
 
 libdialogshowfoto_la_SOURCES = iccprofileinfodlg.cpp imagedialog.cpp rawcameradlg.cpp
 
-libdialogshowfoto_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+libdialogshowfoto_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 
 # Dialogs collection used by digiKam.
 
 libdialog_la_SOURCES = deletedialogbase.ui imagedialog.cpp rawcameradlg.cpp \
 	                   iccprofileinfodlg.cpp deletedialog.cpp dprogressdlg.cpp 
 
-libdialog_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+libdialog_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 
 INCLUDES = -I$(top_srcdir)/digikam/digikam \
 	       -I$(top_srcdir)/digikam/libs/dimg \
diff --git a/digikam/libs/dimg/Makefile.am b/digikam/libs/dimg/Makefile.am
index c0b114e..1faa826 100644
--- a/digikam/libs/dimg/Makefile.am
+++ b/digikam/libs/dimg/Makefile.am
@@ -5,7 +5,7 @@ noinst_LTLIBRARIES = libdimg.la
 
 libdimg_la_SOURCES = dimg.cpp dimgscale.cpp dcolor.cpp dcolorcomposer.cpp ddebug.cpp 
 
-libdimg_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+libdimg_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 
 libdimg_la_LIBADD  = $(top_builddir)/digikam/libs/histogram/libhistogram.la \
 	             $(top_builddir)/digikam/libs/levels/liblevels.la \
diff --git a/digikam/libs/dimg/filters/Makefile.am b/digikam/libs/dimg/filters/Makefile.am
index dc00011..e7c2b4d 100644
--- a/digikam/libs/dimg/filters/Makefile.am
+++ b/digikam/libs/dimg/filters/Makefile.am
@@ -6,7 +6,7 @@ libdimgfilters_la_SOURCES = bcgmodifier.cpp hslmodifier.cpp icctransform.cpp \
 	                    dimgimagefilters.cpp dimgthreadedfilter.cpp \
 	                    dimggaussianblur.cpp dimgsharpen.cpp colormodifier.cpp 
 
-libdimgfilters_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+libdimgfilters_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 
 INCLUDES = -I$(top_srcdir)/digikam/libs/dimg \
 	       -I$(top_srcdir)/digikam/libs/levels \
diff --git a/digikam/libs/dmetadata/Makefile.am b/digikam/libs/dmetadata/Makefile.am
index d42a8eb..14e347b 100644
--- a/digikam/libs/dmetadata/Makefile.am
+++ b/digikam/libs/dmetadata/Makefile.am
@@ -4,7 +4,7 @@ noinst_LTLIBRARIES = libdmetadata.la
 
 libdmetadata_la_SOURCES = dmetadata.cpp
 
-libdmetadata_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+libdmetadata_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 
 libdmetadata_la_LIBADD  = $(LIBKEXIV2_LIBS) $(LIBKDCRAW_LIBS) 
 
diff --git a/digikam/libs/greycstoration/Makefile.am b/digikam/libs/greycstoration/Makefile.am
index c2a152b..f2e0e92 100644
--- a/digikam/libs/greycstoration/Makefile.am
+++ b/digikam/libs/greycstoration/Makefile.am
@@ -6,7 +6,7 @@ noinst_LTLIBRARIES = libgreycstoration.la
 
 libgreycstoration_la_SOURCES = greycstorationiface.cpp greycstorationwidget.cpp
 
-libgreycstoration_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+libgreycstoration_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 
 INCLUDES = -I$(top_srcdir)/digikam/libs/dimg \
 	       -I$(top_srcdir)/digikam/libs/dimg/filters \
diff --git a/digikam/libs/histogram/Makefile.am b/digikam/libs/histogram/Makefile.am
index 2af206b..f43ad9c 100644
--- a/digikam/libs/histogram/Makefile.am
+++ b/digikam/libs/histogram/Makefile.am
@@ -4,7 +4,7 @@ noinst_LTLIBRARIES = libhistogram.la
 
 libhistogram_la_SOURCES = imagehistogram.cpp  
 
-libhistogram_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+libhistogram_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 
 INCLUDES = -I$(top_srcdir)/digikam/libs/dimg \
 		-I$(top_srcdir)/digikam/digikam \
diff --git a/digikam/libs/imageproperties/Makefile.am b/digikam/libs/imageproperties/Makefile.am
index 68f3e8a..6ce0dfa 100644
--- a/digikam/libs/imageproperties/Makefile.am
+++ b/digikam/libs/imageproperties/Makefile.am
@@ -7,7 +7,7 @@ noinst_LTLIBRARIES = libimagepropertiesshowfoto.la libimagepropertiesdigikam.la
 
 libimagepropertiescamgui_la_SOURCES = imagepropertiessidebarcamgui.cpp cameraitempropertiestab.cpp
 
-libimagepropertiescamgui_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+libimagepropertiescamgui_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 
 # Image Properties SideBar for Showfoto (without digiKam database support).
 
@@ -21,7 +21,7 @@ libimagepropertiesshowfoto_la_LIBADD = $(top_builddir)/digikam/libs/widgets/libw
 	                               $(top_builddir)/digikam/libs/threadimageio/libthreadimageio.la \
 	                               $(top_builddir)/digikam/libs/histogram/libhistogram.la 
 
-libimagepropertiesshowfoto_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+libimagepropertiesshowfoto_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 
 # Image Properties SideBar for digiKam Main interface and Image Editor (digiKam database support).
 
@@ -31,7 +31,7 @@ libimagepropertiesdigikam_la_SOURCES = imagedescedittab.cpp imagepropertiessideb
 	                               imagepropertiescolorstab.cpp \
 	                               navigatebarwidget.cpp imagepropertiestab.cpp navigatebartab.cpp
 
-libimagepropertiesdigikam_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+libimagepropertiesdigikam_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 
 INCLUDES = -I$(top_srcdir)/digikam/libs/histogram \
 	   -I$(top_srcdir)/digikam/libs/themeengine \
diff --git a/digikam/libs/jpegutils/Makefile.am b/digikam/libs/jpegutils/Makefile.am
index 527c311..2b8ca34 100644
--- a/digikam/libs/jpegutils/Makefile.am
+++ b/digikam/libs/jpegutils/Makefile.am
@@ -17,6 +17,6 @@ noinst_LTLIBRARIES = libjpegutils.la
 
 libjpegutils_la_SOURCES = jpegutils.cpp transupp.cpp
 
-libjpegutils_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+libjpegutils_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 
 libjpegutils_la_LIBADD  = $(LIBJPEG) 
diff --git a/digikam/libs/levels/Makefile.am b/digikam/libs/levels/Makefile.am
index 010a934..612a6cd 100644
--- a/digikam/libs/levels/Makefile.am
+++ b/digikam/libs/levels/Makefile.am
@@ -4,7 +4,7 @@ noinst_LTLIBRARIES = liblevels.la
 
 liblevels_la_SOURCES = imagelevels.cpp 
 
-liblevels_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+liblevels_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 
 INCLUDES = -I$(top_srcdir)/digikam/libs/dimg \
 	       -I$(top_srcdir)/digikam/libs/histogram \
diff --git a/digikam/libs/themeengine/Makefile.am b/digikam/libs/themeengine/Makefile.am
index 0b9f18d..4197f90 100644
--- a/digikam/libs/themeengine/Makefile.am
+++ b/digikam/libs/themeengine/Makefile.am
@@ -4,7 +4,7 @@ noinst_LTLIBRARIES = libthemeengine.la
 
 libthemeengine_la_SOURCES = theme.cpp themeengine.cpp texture.cpp
 
-libthemeengine_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+libthemeengine_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 
 INCLUDES = -I$(top_srcdir)/digikam/libs/dimg \
  	       -I$(top_srcdir)/digikam/digikam \
diff --git a/digikam/libs/threadimageio/Makefile.am b/digikam/libs/threadimageio/Makefile.am
index afa145b..9c75f68 100644
--- a/digikam/libs/threadimageio/Makefile.am
+++ b/digikam/libs/threadimageio/Makefile.am
@@ -12,7 +12,7 @@ libthreadimageio_la_SOURCES = loadsavethread.cpp \
                               loadingcache.cpp \
                               loadingcacheinterface.cpp
 
-libthreadimageio_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+libthreadimageio_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 
 INCLUDES = -I$(top_srcdir)/digikam/libs/dimg \
 	       -I$(top_srcdir)/digikam/libs/dimg/loaders \
diff --git a/digikam/libs/thumbbar/Makefile.am b/digikam/libs/thumbbar/Makefile.am
index 27d18f6..8894ccc 100644
--- a/digikam/libs/thumbbar/Makefile.am
+++ b/digikam/libs/thumbbar/Makefile.am
@@ -4,7 +4,7 @@ noinst_LTLIBRARIES = libthumbbar.la
 
 libthumbbar_la_SOURCES = thumbbar.cpp thumbnailjob.cpp
 
-libthumbbar_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+libthumbbar_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 
 INCLUDES = -I$(top_srcdir)/digikam/libs/dimg \
 	       -I$(top_srcdir)/digikam/libs/dmetadata \
diff --git a/digikam/libs/whitebalance/Makefile.am b/digikam/libs/whitebalance/Makefile.am
index 64d4c4d..025ff3b 100644
--- a/digikam/libs/whitebalance/Makefile.am
+++ b/digikam/libs/whitebalance/Makefile.am
@@ -4,7 +4,7 @@ noinst_LTLIBRARIES = libwhitebalance.la
 
 libwhitebalance_la_SOURCES = whitebalance.cpp 
 
-libwhitebalance_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+libwhitebalance_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 
 INCLUDES = -I$(top_srcdir)/digikam/libs/histogram \
 	   -I$(top_srcdir)/digikam/libs/dimg \
diff --git a/digikam/libs/widgets/Makefile.am b/digikam/libs/widgets/Makefile.am
index c7116ff..fe8d6c1 100644
--- a/digikam/libs/widgets/Makefile.am
+++ b/digikam/libs/widgets/Makefile.am
@@ -4,7 +4,7 @@ noinst_LTLIBRARIES = libwidgets.la
 
 libwidgets_la_SOURCES =
 
-libwidgets_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+libwidgets_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 
 libwidgets_la_LIBADD = $(top_builddir)/digikam/libs/widgets/metadata/libmetadatawidgets.la \
 	               $(top_builddir)/digikam/libs/widgets/iccprofiles/libiccprofileswidgets.la \
diff --git a/digikam/libs/widgets/common/Makefile.am b/digikam/libs/widgets/common/Makefile.am
index 7032e18..d516efb 100644
--- a/digikam/libs/widgets/common/Makefile.am
+++ b/digikam/libs/widgets/common/Makefile.am
@@ -7,7 +7,7 @@ libcommonwidgets_la_SOURCES = histogramwidget.cpp colorgradientwidget.cpp curves
                               statuszoombar.cpp statusnavigatebar.cpp statusprogressbar.cpp searchtextbar.cpp \
                               dcursortracker.cpp paniconwidget.cpp previewwidget.cpp splashscreen.cpp statusled.cpp 
 
-libcommonwidgets_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+libcommonwidgets_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 
 INCLUDES = -I$(top_srcdir)/digikam/libs/histogram \
 	       -I$(top_srcdir)/digikam/libs/curves \
diff --git a/digikam/libs/widgets/iccprofiles/Makefile.am b/digikam/libs/widgets/iccprofiles/Makefile.am
index 71fdbbe..32ab7db 100644
--- a/digikam/libs/widgets/iccprofiles/Makefile.am
+++ b/digikam/libs/widgets/iccprofiles/Makefile.am
@@ -4,7 +4,7 @@ noinst_LTLIBRARIES = libiccprofileswidgets.la
 
 libiccprofileswidgets_la_SOURCES = iccprofilewidget.cpp cietonguewidget.cpp iccpreviewwidget.cpp 
 
-libiccprofileswidgets_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+libiccprofileswidgets_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 
 libiccprofileswidgets_la_LIBADD = $(top_builddir)/digikam/libs/lprof/liblprof.la 
                  
diff --git a/digikam/libs/widgets/imageplugins/Makefile.am b/digikam/libs/widgets/imageplugins/Makefile.am
index c51e05d..4b5390d 100644
--- a/digikam/libs/widgets/imageplugins/Makefile.am
+++ b/digikam/libs/widgets/imageplugins/Makefile.am
@@ -5,7 +5,7 @@ noinst_LTLIBRARIES = libimagepluginswidgets.la
 libimagepluginswidgets_la_SOURCES = imageregionwidget.cpp imagepaniconwidget.cpp imageguidewidget.cpp \
 	                                imagewidget.cpp listboxpreviewitem.cpp imagepanelwidget.cpp
 
-libimagepluginswidgets_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+libimagepluginswidgets_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
                  
 INCLUDES = -I$(top_srcdir)/digikam/utilities/imageeditor/editor \
 	       -I$(top_srcdir)/digikam/libs/dimg \
diff --git a/digikam/libs/widgets/metadata/Makefile.am b/digikam/libs/widgets/metadata/Makefile.am
index e14c778..dfe0e33 100644
--- a/digikam/libs/widgets/metadata/Makefile.am
+++ b/digikam/libs/widgets/metadata/Makefile.am
@@ -6,7 +6,7 @@ libmetadatawidgets_la_SOURCES = metadatalistview.cpp metadatalistviewitem.cpp me
 	                            iptcwidget.cpp exifwidget.cpp mdkeylistviewitem.cpp \
 	                            makernotewidget.cpp gpswidget.cpp worldmapwidget.cpp
 
-libmetadatawidgets_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+libmetadatawidgets_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 
 INCLUDES = -I$(top_srcdir)/digikam/libs/dmetadata \
 	       -I$(top_srcdir)/digikam/libs/dimg \
diff --git a/digikam/project/project.kdevelop b/digikam/project/project.kdevelop
index 8ca975b..cd65096 100644
--- a/digikam/project/project.kdevelop
+++ b/digikam/project/project.kdevelop
@@ -123,7 +123,7 @@
       <globalcwd>/home/gilles/Documents/Devel/SVN/branches/graphics/digikam/project/../..</globalcwd>
       <useglobalprogram>true</useglobalprogram>
       <autoinstall>false</autoinstall>
-      <autokdesu>false</autokdesu>
+      <autotdesu>false</autotdesu>
     </run>
     <general>
       <useconfiguration>default</useconfiguration>
diff --git a/digikam/showfoto/setup/Makefile.am b/digikam/showfoto/setup/Makefile.am
index 6b4758c..c6e5ada 100644
--- a/digikam/showfoto/setup/Makefile.am
+++ b/digikam/showfoto/setup/Makefile.am
@@ -8,7 +8,7 @@ noinst_LTLIBRARIES = libsetup.la
 
 libsetup_la_SOURCES = setup.cpp setupeditor.cpp setuptooltip.cpp
 
-libsetup_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+libsetup_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 
 libsetup_la_LIBADD = $(top_builddir)/digikam/utilities/setup/libshowfotosetup.la 
 
diff --git a/digikam/themedesigner/Makefile.am b/digikam/themedesigner/Makefile.am
index 9c328b0..dc12bdb 100644
--- a/digikam/themedesigner/Makefile.am
+++ b/digikam/themedesigner/Makefile.am
@@ -16,4 +16,4 @@ digikamthemedesigner_SOURCES = main.cpp mainwindow.cpp themedicongroupitem.cpp \
 digikamthemedesigner_LDADD = $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) \
 	                     $(top_builddir)/digikam/digikam/libdigikam.la 
 
-digikamthemedesigner_LDFLAGS = $(KDE_RPATH) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor $(LIB_KUTILS)
+digikamthemedesigner_LDFLAGS = $(KDE_RPATH) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor $(LIB_KUTILS)
diff --git a/digikam/utilities/batch/Makefile.am b/digikam/utilities/batch/Makefile.am
index cd348f9..4fea6e4 100644
--- a/digikam/utilities/batch/Makefile.am
+++ b/digikam/utilities/batch/Makefile.am
@@ -15,6 +15,6 @@ noinst_LTLIBRARIES = libbatch.la
 libbatch_la_SOURCES = batchthumbsgenerator.cpp batchalbumssyncmetadata.cpp \
 	              imageinfojob.cpp imageinfoalbumsjob.cpp batchsyncmetadata.cpp 
 
-libbatch_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+libbatch_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 
 
diff --git a/digikam/utilities/cameragui/Makefile.am b/digikam/utilities/cameragui/Makefile.am
index 239a47f..6eb35a6 100644
--- a/digikam/utilities/cameragui/Makefile.am
+++ b/digikam/utilities/cameragui/Makefile.am
@@ -13,7 +13,7 @@ libcameragui_la_SOURCES = gpcamera.cpp cameraui.cpp cameraiconview.cpp  \
 	                  camerainfodialog.cpp albumselectdialog.cpp \
 	                  camerafolderdialog.cpp freespacewidget.cpp 
 
-libcameragui_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+libcameragui_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 
 libcameragui_la_LIBADD  = $(top_builddir)/digikam/libs/imageproperties/libimagepropertiescamgui.la \
 	                  $(LIB_GPHOTO) $(LIBJPEG)
diff --git a/digikam/utilities/imageeditor/tools/imageprint.h b/digikam/utilities/imageeditor/tools/imageprint.h
index 8a1d787..56829ae 100644
--- a/digikam/utilities/imageeditor/tools/imageprint.h
+++ b/digikam/utilities/imageeditor/tools/imageprint.h
@@ -34,7 +34,7 @@
 
 #include <kurl.h>
 #include <kprinter.h>
-#include <kdeprint/kprintdialogpage.h>
+#include <tdeprint/kprintdialogpage.h>
 
 // Local includes.
 
diff --git a/digikam/utilities/lighttable/Makefile.am b/digikam/utilities/lighttable/Makefile.am
index f2d59d3..55cb8c6 100644
--- a/digikam/utilities/lighttable/Makefile.am
+++ b/digikam/utilities/lighttable/Makefile.am
@@ -22,7 +22,7 @@ noinst_LTLIBRARIES = liblighttable.la
 liblighttable_la_SOURCES = lighttablebar.cpp lighttablewindow.cpp lighttablepreview.cpp \
                            lighttableview.cpp 
 
-liblighttable_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+liblighttable_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 
 rcdir = $(kde_datadir)/digikam
 rc_DATA = lighttablewindowui.rc
diff --git a/digikam/utilities/setup/Makefile.am b/digikam/utilities/setup/Makefile.am
index be63afe..2b07df9 100644
--- a/digikam/utilities/setup/Makefile.am
+++ b/digikam/utilities/setup/Makefile.am
@@ -25,5 +25,5 @@ libsetup_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_GPHOTO)
 libshowfotosetup_la_SOURCES = setupiofiles.cpp setupdcraw.cpp \
 	                      setupicc.cpp setupslideshow.cpp 
 
-libshowfotosetup_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+libshowfotosetup_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 
diff --git a/digikam/utilities/slideshow/Makefile.am b/digikam/utilities/slideshow/Makefile.am
index 437457d..411a240 100644
--- a/digikam/utilities/slideshow/Makefile.am
+++ b/digikam/utilities/slideshow/Makefile.am
@@ -12,6 +12,6 @@ noinst_LTLIBRARIES = libslideshow.la
 
 libslideshow_la_SOURCES = toolbar.cpp slideshow.cpp 
 
-libslideshow_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+libslideshow_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 
 
diff --git a/po/lt/digikam.po b/po/lt/digikam.po
index 226b3a8..fd27750 100644
--- a/po/lt/digikam.po
+++ b/po/lt/digikam.po
@@ -601,7 +601,7 @@ msgstr "Tr"
 #, fuzzy
 msgid "All Tags"
 msgstr ""
-"#-#-#-#-#  kdeprint.po (kdeprint)  #-#-#-#-#\n"
+"#-#-#-#-#  tdeprint.po (tdeprint)  #-#-#-#-#\n"
 "Visus puslapius\n"
 "#-#-#-#-#  ppdtranslations.po (ppdtranslations)  #-#-#-#-#\n"
 "Visuose puslapiuose"
@@ -3204,7 +3204,7 @@ msgstr ""
 #, fuzzy
 msgid "As well as"
 msgstr ""
-"#-#-#-#-#  kdeprint.po (kdeprint)  #-#-#-#-#\n"
+"#-#-#-#-#  tdeprint.po (tdeprint)  #-#-#-#-#\n"
 "Visus puslapius\n"
 "#-#-#-#-#  ppdtranslations.po (ppdtranslations)  #-#-#-#-#\n"
 "Visuose puslapiuose"