diff --git a/ChangeLog b/ChangeLog
index e5fc4bf..49af012 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -86,7 +86,7 @@
 * New Class KMFAppState: Holds some static variables giving information about the app's state
 * Some minor Fixes
 * Started documentaion for plugin framework
-* Enable kdesu for running commands if not started as root
+* Enable tdesu for running commands if not started as root
 * Started implementing Template saving
 * Added HP link URl to about dialog
 * Minor code cleanup
diff --git a/KMFIPTInterface/kmfiptinterface_ctl b/KMFIPTInterface/kmfiptinterface_ctl
index 05c2688..3f02813 100755
--- a/KMFIPTInterface/kmfiptinterface_ctl
+++ b/KMFIPTInterface/kmfiptinterface_ctl
@@ -2,6 +2,6 @@
 SERVER="`dcopserver --serverid 2>&1`" 
 echo -n "Server:" 
 echo $SERVER
-kdesu -t --nonewdcop -u root -c kmfiptinterface --dcopserver=$SERVER
+tdesu -t --nonewdcop -u root -c kmfiptinterface --dcopserver=$SERVER
 
 
diff --git a/KMFSysTray/Makefile.am b/KMFSysTray/Makefile.am
index 7718bd1..9df721b 100644
--- a/KMFSysTray/Makefile.am
+++ b/KMFSysTray/Makefile.am
@@ -7,7 +7,7 @@ bin_PROGRAMS = kmfsystray
 
 
 
-kmfsystray_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+kmfsystray_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 kmfsystray_LDADD = ../kmyfirewall/core/libkmfcore.la ../kmyfirewall/kmfwidgets/libkmfwidgets.la $(LIB_KDEUI) $(LIB_KPARTS)
 
 kmfsystray_DATA = kmfsystray.desktop
diff --git a/KMFSysTray/kmfsystray.cpp b/KMFSysTray/kmfsystray.cpp
index 35ab6ef..28454d7 100644
--- a/KMFSysTray/kmfsystray.cpp
+++ b/KMFSysTray/kmfsystray.cpp
@@ -99,7 +99,7 @@ void KMFSysTray::slotSetRunningtqStatus( bool on ) {
 
 void KMFSysTray::slotLaunchKMF () {
 	KProcess *childproc = new KProcess();
-	*childproc << "kdesu";
+	*childproc << "tdesu";
  	*childproc << "kmyfirewall";
 	childproc->start( KProcess:: DontCare, KProcess::NoCommunication );
 }
diff --git a/acinclude.m4 b/acinclude.m4
index 8e515d0..5f15972 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 a506394..9a30313 100644
--- a/config.log
+++ b/config.log
@@ -318,7 +318,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/doc/Makefile b/doc/Makefile
index 3dcd31e..18c757e 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -154,11 +154,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 = 
@@ -284,7 +284,7 @@ kde_styledir = ${libdir}/trinity/plugins/styles
 kde_templatesdir = /usr/share/templates
 kde_wallpaperdir = /usr/share/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/doc/kmyfirewall/Makefile b/doc/kmyfirewall/Makefile
index c56326a..3344b66 100644
--- a/doc/kmyfirewall/Makefile
+++ b/doc/kmyfirewall/Makefile
@@ -138,11 +138,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 = 
@@ -268,7 +268,7 @@ kde_styledir = ${libdir}/trinity/plugins/styles
 kde_templatesdir = /usr/share/templates
 kde_wallpaperdir = /usr/share/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/doc/kmyfirewall/index.docbook b/doc/kmyfirewall/index.docbook
index 2b16a0a..f753ae8 100644
--- a/doc/kmyfirewall/index.docbook
+++ b/doc/kmyfirewall/index.docbook
@@ -1511,7 +1511,7 @@ You may find a downloadlink and some more information about it there.
 
 <!--
 List any special requirements for your application here. This should include:
-.Libraries or other software that is not included in kdesupport,
+.Libraries or other software that is not included in tdesupport,
 kdelibs, or kdebase.
 .Hardware requirements like amount of RAM, disk space, graphics card
 capabilities, screen resolution, special expansion cards, etc.
diff --git a/kmyfirewall.kdevelop b/kmyfirewall.kdevelop
index 696a0c9..6ce7c90 100644
--- a/kmyfirewall.kdevelop
+++ b/kmyfirewall.kdevelop
@@ -128,7 +128,7 @@
       <globalcwd>/home/animal/devel/KDE-SVN/kmyfirewall</globalcwd>
       <useglobalprogram>true</useglobalprogram>
       <autoinstall>false</autoinstall>
-      <autokdesu>false</autokdesu>
+      <autotdesu>false</autotdesu>
     </run>
     <general>
       <useconfiguration>default</useconfiguration>
diff --git a/kmyfirewall/Makefile.am b/kmyfirewall/Makefile.am
index 9d6e0b5..7047673 100644
--- a/kmyfirewall/Makefile.am
+++ b/kmyfirewall/Makefile.am
@@ -11,7 +11,7 @@ METASOURCES = AUTO
 #########################################################################
 bin_PROGRAMS = kmyfirewall
 kmyfirewall_SOURCES = kmfconfigdialog.cpp kmyfirewall.cpp main.cpp
-kmyfirewall_LDFLAGS = -no-undefined $(KDE_RPATH) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+kmyfirewall_LDFLAGS = -no-undefined $(KDE_RPATH) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 kmyfirewall_LDADD = kmfwidgets/libkmfwidgets.la \
 	core/libkmfcore.la $(LIB_KPARTS)
 
diff --git a/kmyfirewall/core/kprocesswrapper.cpp b/kmyfirewall/core/kprocesswrapper.cpp
index 26412f1..104b398 100644
--- a/kmyfirewall/core/kprocesswrapper.cpp
+++ b/kmyfirewall/core/kprocesswrapper.cpp
@@ -83,7 +83,7 @@ void KProcessWrapper::slotStartLocalJob( const TQString& jobName, const TQString
 	
 	m_childproc->clearArguments();
 	if ( useKdeSu ) {
-		*m_childproc << "kdesu" << "-t" << "-i" << "kmyfirewall" << "--noignorebutton" << "-d" << "-c" << localScriptFile;
+		*m_childproc << "tdesu" << "-t" << "-i" << "kmyfirewall" << "--noignorebutton" << "-d" << "-c" << localScriptFile;
 	} else {
 		*m_childproc << "bash" << localScriptFile;
 	}
diff --git a/kmyfirewall/core/xmlnames.cpp b/kmyfirewall/core/xmlnames.cpp
index 048f7c8..d8e2637 100644
--- a/kmyfirewall/core/xmlnames.cpp
+++ b/kmyfirewall/core/xmlnames.cpp
@@ -145,7 +145,7 @@ const TQString& Constants::StopFirewallJob_Name = "stop_firewall_job";
 const TQString& Constants::InstallFirewallJob_Name = "install_firewall_job";
 const TQString& Constants::UninstallFirewallJob_Name = "uninstall_firewall_job";
 const TQString& Constants::ShowConfigJob_Name = "show_config_job";
-// const TQString& Constants::KdeSu_Cmd = "kdesu -t -i kmyfirewall -d -c ";
+// const TQString& Constants::KdeSu_Cmd = "tdesu -t -i kmyfirewall -d -c ";
 
 }
 
diff --git a/kmyfirewall/installer/openbsd/Makefile b/kmyfirewall/installer/openbsd/Makefile
index e1341d4..b09a780 100644
--- a/kmyfirewall/installer/openbsd/Makefile
+++ b/kmyfirewall/installer/openbsd/Makefile
@@ -192,11 +192,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 = 
@@ -321,7 +321,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/kmyfirewall/installer/openbsd/kmfpfinstaller.cpp b/kmyfirewall/installer/openbsd/kmfpfinstaller.cpp
index 70889ef..ba8ce64 100644
--- a/kmyfirewall/installer/openbsd/kmfpfinstaller.cpp
+++ b/kmyfirewall/installer/openbsd/kmfpfinstaller.cpp
@@ -73,7 +73,7 @@ KMFPFInstaller::KMFPFInstaller( TQObject* parent, const char* name ) :  KMFPlugi
 	temp_file = new KTempFile();
 	temp_file2 = new KTempFile();
 	m_execWidget = 0;
-	// m_kdesuCommand = Constants::KdeSu_Cmd + " -i kmyfirewall -d -c ";
+	// m_tdesuCommand = Constants::KdeSu_Cmd + " -i kmyfirewall -d -c ";
 	loadIcons();
 	execWidget();*/
 }
diff --git a/kmyfirewall/kmfwidgets/kmfprocout.cpp b/kmyfirewall/kmfwidgets/kmfprocout.cpp
index 4e99929..46635a2 100644
--- a/kmyfirewall/kmfwidgets/kmfprocout.cpp
+++ b/kmyfirewall/kmfwidgets/kmfprocout.cpp
@@ -102,7 +102,7 @@ void KMFProcOut::startJob( const TQString &cmd, bool useKdeSu ) {
 	
 	childproc->clearArguments();
 	if( useKdeSu ) {
-		*childproc << "kdesu" << "-t" << "-i" << "kmyfirewall" << "--noignorebutton" << "-d" << "-c" << cmd;
+		*childproc << "tdesu" << "-t" << "-i" << "kmyfirewall" << "--noignorebutton" << "-d" << "-c" << cmd;
 	} else {
 		*childproc << "bash" << cmd;
 	}