diff --git a/atlantikdesigner/Makefile.am b/atlantikdesigner/Makefile.am
index 5e5e41c..4c02d24 100644
--- a/atlantikdesigner/Makefile.am
+++ b/atlantikdesigner/Makefile.am
@@ -1,5 +1,5 @@
 INCLUDES = $(all_includes)
-LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 LDADD = $(LIB_TDESYCOCA) $(LIB_TDEFILE)
 
 SUBDIRS = designer pics
diff --git a/atlantikdesigner/designer/Makefile.am b/atlantikdesigner/designer/Makefile.am
index 7ae5822..1dccd01 100644
--- a/atlantikdesigner/designer/Makefile.am
+++ b/atlantikdesigner/designer/Makefile.am
@@ -1,6 +1,6 @@
 bin_PROGRAMS = atlantikdesigner
 INCLUDES = -I$(kde_includes)/atlantic $(all_includes) -I$(kde_includes)/tde
-AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -latlantic
+AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -latlantic
 LDADD = -latlantikui -ltdegames $(LIB_TDEIO) 
 
 SUBDIRS = 
diff --git a/konq-plugins/fsview/Makefile.am b/konq-plugins/fsview/Makefile.am
index ce4c68b..ad4f3c8 100644
--- a/konq-plugins/fsview/Makefile.am
+++ b/konq-plugins/fsview/Makefile.am
@@ -24,21 +24,21 @@ libfsview_la_SOURCES = treemap.cpp fsview.cpp scan.cpp inode.cpp
 
 bin_PROGRAMS = fsview
 
-fsview_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+fsview_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 fsview_SOURCES = main.cpp
-fsview_LDADD   = libfsview.la $(LIB_TDEIO) $(LIB_TDECORE) $(LIB_QT) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+fsview_LDADD   = libfsview.la $(LIB_TDEIO) $(LIB_TDECORE) $(LIB_TQT) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 
 check_PROGRAMS = scantest
 
-scantest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+scantest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 scantest_SOURCES = scantest.cpp
-scantest_LDADD   = libfsview.la $(LIB_TDEIO) $(LIB_TDECORE) $(LIB_QT) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+scantest_LDADD   = libfsview.la $(LIB_TDEIO) $(LIB_TDECORE) $(LIB_TQT) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 
 # The KPart
 
 kde_module_LTLIBRARIES = libfsviewpart.la
 libfsviewpart_la_SOURCES = fsview_part.cpp
-libfsviewpart_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+libfsviewpart_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 libfsviewpart_la_LIBADD  = libfsview.la $(LIB_TDEPARTS) $(LIB_TDEIO) -lkonq
 
 partdesktopdir   = $(kde_servicesdir)
diff --git a/ksig/Makefile.am b/ksig/Makefile.am
index 48efcd7..1e1fd6f 100644
--- a/ksig/Makefile.am
+++ b/ksig/Makefile.am
@@ -8,8 +8,8 @@ INCLUDES = $(all_includes)
 METASOURCES = AUTO
 KDE_ICON = AUTO
 
-ksig_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
-ksig_LDADD   =  $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI)
+ksig_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+ksig_LDADD   =  $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI)
 
 rcdir = $(kde_datadir)/ksig
 rc_DATA = ksigui.rc
diff --git a/noatun-plugins/synaescope/Makefile.am b/noatun-plugins/synaescope/Makefile.am
index 6108736..8e9b173 100644
--- a/noatun-plugins/synaescope/Makefile.am
+++ b/noatun-plugins/synaescope/Makefile.am
@@ -11,7 +11,7 @@ noatunsynaescope_la_LIBADD = $(LIB_TDEFILE) -lnoatun -lm
 bin_PROGRAMS = noatunsynaescope.bin
 
 noatunsynaescope_bin_SOURCES = core.cpp main.cpp sdlwrap.cpp ui.cpp
-noatunsynaescope_bin_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+noatunsynaescope_bin_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 noatunsynaescope_bin_LDADD = $(LIB_TDEUI) -lnoatun $(SDL_LIBS)
 
 noatun_DATA = synaescope.plugin
diff --git a/noatun-plugins/tippercanoe/Makefile.am b/noatun-plugins/tippercanoe/Makefile.am
index 4be7a80..b8474d8 100644
--- a/noatun-plugins/tippercanoe/Makefile.am
+++ b/noatun-plugins/tippercanoe/Makefile.am
@@ -11,7 +11,7 @@ noatuntippecanoe_la_LIBADD = $(LIB_TDEFILE) -lnoatun -lm
 bin_PROGRAMS = noatuntippecanoe.bin
 
 noatuntippecanoe_bin_SOURCES = core.cpp main.cpp ui.cpp sdlwrap.cpp
-noatuntippecanoe_bin_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+noatuntippecanoe_bin_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 noatuntippecanoe_bin_LDADD = $(LIB_TDEUI) -lm $(SDL_LIBS)
 
 noatun_DATA = tippecanoe.plugin
diff --git a/noatun-plugins/tyler/Makefile.am b/noatun-plugins/tyler/Makefile.am
index 985df78..8ccecc1 100644
--- a/noatun-plugins/tyler/Makefile.am
+++ b/noatun-plugins/tyler/Makefile.am
@@ -11,7 +11,7 @@ noatuntyler_la_LIBADD = $(LIB_TDEFILE) -lnoatun -lm
 bin_PROGRAMS = noatuntyler.bin
 
 noatuntyler_bin_SOURCES = main.cpp file.cpp compute.c display.c renderer.c
-noatuntyler_bin_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+noatuntyler_bin_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 noatuntyler_bin_LDADD = $(LIB_TDECORE) -lm $(SDL_LIBS)
 
 noatun_DATA = tyler.plugin tylerstates
diff --git a/tdefile-plugins/lnk/Makefile.am b/tdefile-plugins/lnk/Makefile.am
index 8801441..5e066df 100644
--- a/tdefile-plugins/lnk/Makefile.am
+++ b/tdefile-plugins/lnk/Makefile.am
@@ -6,7 +6,7 @@ bin_PROGRAMS = lnkforward
 
 lnkforward_SOURCES = lnkforward.cpp
 lnkforward_LDADD = $(LIB_TDECORE) $(LIB_TDEIO)
-lnkforward_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+lnkforward_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 lnkforward_METASOURCES = lnkforward.moc
 
 lnkforward_DATA = lnkforward.desktop