diff --git a/acinclude.m4 b/acinclude.m4
index 1353a9d..182a02b 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -2263,23 +2263,23 @@ if test $kde_qtver = 4; then
    AC_SUBST(LIB_KDED, $lib_kded)
    AC_SUBST(LIB_TDECORE, "-ltdecore")
    AC_SUBST(LIB_TDEUI, "-ltdeui")
-   AC_SUBST(LIB_KIO, "-ltdeio")
+   AC_SUBST(LIB_TDEIO, "-ltdeio")
    AC_SUBST(LIB_KJS, "-lkjs")
    AC_SUBST(LIB_SMB, "-lsmb")
    AC_SUBST(LIB_KAB, "-lkab")
    AC_SUBST(LIB_TDEABC, "-ltdeabc")
    AC_SUBST(LIB_TDEHTML, "-ltdehtml")
-   AC_SUBST(LIB_KSPELL, "-ltdespell")
-   AC_SUBST(LIB_KPARTS, "-ltdeparts")
+   AC_SUBST(LIB_TDESPELL, "-ltdespell")
+   AC_SUBST(LIB_TDEPARTS, "-ltdeparts")
    AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
-   AC_SUBST(LIB_KUTILS, "-ltdeutils")
+   AC_SUBST(LIB_TDEUTILS, "-ltdeutils")
    AC_SUBST(LIB_TDEPIM, "-ltdepim")
-   AC_SUBST(LIB_KIMPROXY, "-ltdeimproxy")
+   AC_SUBST(LIB_TDEIMPROXY, "-ltdeimproxy")
    AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff")
-   AC_SUBST(LIB_KDNSSD, "-ltdednssd")
-   AC_SUBST(LIB_KUNITTEST, "-ltdeunittest")
+   AC_SUBST(LIB_TDEDNSSD, "-ltdednssd")
+   AC_SUBST(LIB_TDEUNITTEST, "-ltdeunittest")
 # these are for backward compatibility
-   AC_SUBST(LIB_KSYCOCA, "-ltdeio")
+   AC_SUBST(LIB_TDESYCOCA, "-ltdeio")
    AC_SUBST(LIB_TDEFILE, "-ltdeio")
 elif test $kde_qtver = 3; then
    case $host in 
@@ -2289,35 +2289,35 @@ elif test $kde_qtver = 3; then
    AC_SUBST(LIB_KDED, $lib_kded)
    AC_SUBST(LIB_TDECORE, "-ltdecore")
    AC_SUBST(LIB_TDEUI, "-ltdeui")
-   AC_SUBST(LIB_KIO, "-ltdeio")
+   AC_SUBST(LIB_TDEIO, "-ltdeio")
    AC_SUBST(LIB_KJS, "-lkjs")
    AC_SUBST(LIB_SMB, "-lsmb")
    AC_SUBST(LIB_KAB, "-lkab")
    AC_SUBST(LIB_TDEABC, "-ltdeabc")
    AC_SUBST(LIB_TDEHTML, "-ltdehtml")
-   AC_SUBST(LIB_KSPELL, "-ltdespell")
-   AC_SUBST(LIB_KPARTS, "-ltdeparts")
+   AC_SUBST(LIB_TDESPELL, "-ltdespell")
+   AC_SUBST(LIB_TDEPARTS, "-ltdeparts")
    AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
-   AC_SUBST(LIB_KUTILS, "-ltdeutils")
+   AC_SUBST(LIB_TDEUTILS, "-ltdeutils")
    AC_SUBST(LIB_TDEPIM, "-ltdepim")
-   AC_SUBST(LIB_KIMPROXY, "-ltdeimproxy")
+   AC_SUBST(LIB_TDEIMPROXY, "-ltdeimproxy")
    AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff")
-   AC_SUBST(LIB_KDNSSD, "-ltdednssd")
-   AC_SUBST(LIB_KUNITTEST, "-ltdeunittest")
+   AC_SUBST(LIB_TDEDNSSD, "-ltdednssd")
+   AC_SUBST(LIB_TDEUNITTEST, "-ltdeunittest")
 # these are for backward compatibility
-   AC_SUBST(LIB_KSYCOCA, "-ltdeio")
+   AC_SUBST(LIB_TDESYCOCA, "-ltdeio")
    AC_SUBST(LIB_TDEFILE, "-ltdeio")
 elif test $kde_qtver = 2; then
    AC_SUBST(LIB_TDECORE, "-ltdecore")
    AC_SUBST(LIB_TDEUI, "-ltdeui")
-   AC_SUBST(LIB_KIO, "-ltdeio")
-   AC_SUBST(LIB_KSYCOCA, "-ltdesycoca")
+   AC_SUBST(LIB_TDEIO, "-ltdeio")
+   AC_SUBST(LIB_TDESYCOCA, "-ltdesycoca")
    AC_SUBST(LIB_SMB, "-lsmb")
    AC_SUBST(LIB_TDEFILE, "-ltdefile")
    AC_SUBST(LIB_KAB, "-lkab")
    AC_SUBST(LIB_TDEHTML, "-ltdehtml")
-   AC_SUBST(LIB_KSPELL, "-ltdespell")
-   AC_SUBST(LIB_KPARTS, "-ltdeparts")
+   AC_SUBST(LIB_TDESPELL, "-ltdespell")
+   AC_SUBST(LIB_TDEPARTS, "-ltdeparts")
    AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
 else
    AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)")
diff --git a/aclocal.m4 b/aclocal.m4
index 3cfedc0..cc318c7 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -2082,35 +2082,35 @@ if test $kde_qtver = 3; then
    AC_SUBST(LIB_KDED, $lib_kded)
    AC_SUBST(LIB_TDECORE, "-ltdecore")
    AC_SUBST(LIB_TDEUI, "-ltdeui")
-   AC_SUBST(LIB_KIO, "-ltdeio")
+   AC_SUBST(LIB_TDEIO, "-ltdeio")
    AC_SUBST(LIB_KJS, "-lkjs")
    AC_SUBST(LIB_SMB, "-lsmb")
    AC_SUBST(LIB_KAB, "-lkab")
    AC_SUBST(LIB_TDEABC, "-ltdeabc")
    AC_SUBST(LIB_TDEHTML, "-ltdehtml")
-   AC_SUBST(LIB_KSPELL, "-ltdespell")
-   AC_SUBST(LIB_KPARTS, "-ltdeparts")
+   AC_SUBST(LIB_TDESPELL, "-ltdespell")
+   AC_SUBST(LIB_TDEPARTS, "-ltdeparts")
    AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
-   AC_SUBST(LIB_KUTILS, "-ltdeutils")
+   AC_SUBST(LIB_TDEUTILS, "-ltdeutils")
    AC_SUBST(LIB_TDEPIM, "-ltdepim")
-   AC_SUBST(LIB_KIMPROXY, "-ltdeimproxy")
+   AC_SUBST(LIB_TDEIMPROXY, "-ltdeimproxy")
    AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff")
-   AC_SUBST(LIB_KDNSSD, "-ltdednssd")
-   AC_SUBST(LIB_KUNITTEST, "-ltdeunittest")
+   AC_SUBST(LIB_TDEDNSSD, "-ltdednssd")
+   AC_SUBST(LIB_TDEUNITTEST, "-ltdeunittest")
 # these are for backward compatibility
-   AC_SUBST(LIB_KSYCOCA, "-ltdeio")
+   AC_SUBST(LIB_TDESYCOCA, "-ltdeio")
    AC_SUBST(LIB_TDEFILE, "-ltdeio")
 elif test $kde_qtver = 2; then
    AC_SUBST(LIB_TDECORE, "-ltdecore")
    AC_SUBST(LIB_TDEUI, "-ltdeui")
-   AC_SUBST(LIB_KIO, "-ltdeio")
-   AC_SUBST(LIB_KSYCOCA, "-ltdesycoca")
+   AC_SUBST(LIB_TDEIO, "-ltdeio")
+   AC_SUBST(LIB_TDESYCOCA, "-ltdesycoca")
    AC_SUBST(LIB_SMB, "-lsmb")
    AC_SUBST(LIB_TDEFILE, "-ltdefile")
    AC_SUBST(LIB_KAB, "-lkab")
    AC_SUBST(LIB_TDEHTML, "-ltdehtml")
-   AC_SUBST(LIB_KSPELL, "-ltdespell")
-   AC_SUBST(LIB_KPARTS, "-ltdeparts")
+   AC_SUBST(LIB_TDESPELL, "-ltdespell")
+   AC_SUBST(LIB_TDEPARTS, "-ltdeparts")
    AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
 else
    AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)")
diff --git a/adept/batch/Makefile.am b/adept/batch/Makefile.am
index 8f69721..e945a2f 100644
--- a/adept/batch/Makefile.am
+++ b/adept/batch/Makefile.am
@@ -1,7 +1,7 @@
 bin_PROGRAMS = adept_batch
 noinst_HEADERS = app.h
 adept_batch_SOURCES = main.cpp app.cpp
-adept_batch_LDADD = ../adept/libadept.la -lapt-front -ltagcoll2 $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_KIO) $(LIB_TDEUI)
+adept_batch_LDADD = ../adept/libadept.la -lapt-front -ltagcoll2 $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEIO) $(LIB_TDEUI)
 adept_batch_LDFLAGS = -L/usr/lib/debug
 INCLUDES = $(all_includes) $(TAGCOLL2_CFLAGS) $(LIBAPT_FRONT_CFLAGS) -I$(srcdir)/.. -I..
 KDE_CXXFLAGS = $(USE_EXCEPTIONS) -DQT_NO_ASCII_CAST -DQT_NO_CAST_ASCII
diff --git a/adept/installer/Makefile.am b/adept/installer/Makefile.am
index 8723922..34cc832 100644
--- a/adept/installer/Makefile.am
+++ b/adept/installer/Makefile.am
@@ -2,7 +2,7 @@
 bin_PROGRAMS = adept_installer
 noinst_HEADERS = app.h
 adept_installer_SOURCES = main.cpp app.cpp
-adept_installer_LDADD = ../adept/libadept.la -lapt-front -lapt-pkg $(LIBTAGCOLL2_LIBS) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_KIO) $(LIB_TDEUI)
+adept_installer_LDADD = ../adept/libadept.la -lapt-front -lapt-pkg $(LIBTAGCOLL2_LIBS) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEIO) $(LIB_TDEUI)
 adept_installer_LDFLAGS = -L/usr/lib/debug
 INCLUDES = $(all_includes) $(LIBEPT_CFLAGS) $(LIBTAGCOLL2_CFLAGS) $(LIBAPT_FRONT_CFLAGS) $(LIBWIBBLE_CFLAGS)  -I$(srcdir)/.. -I.. $(TAGCOLL2_CFLAGS)
 KDE_CXXFLAGS = $(USE_EXCEPTIONS) -DQT_NO_ASCII_CAST -DQT_NO_CAST_ASCII \
diff --git a/adept/kubuntu_upgrader/Makefile.am b/adept/kubuntu_upgrader/Makefile.am
index 63e9569..560119e 100644
--- a/adept/kubuntu_upgrader/Makefile.am
+++ b/adept/kubuntu_upgrader/Makefile.am
@@ -3,7 +3,7 @@ noinst_LTLIBRARIES = libkubuntuupgradewizard.la
 libkubuntuupgradewizard_la_SOURCES = \
 	upgradewizardbase.ui errordialogbase.ui \
 	errordialog.cpp upgradewizard.cpp
-libkubuntuupgradewizard_la_LIBADD = $(LIB_KIO) $(LIBKDE_UI)
+libkubuntuupgradewizard_la_LIBADD = $(LIB_TDEIO) $(LIBKDE_UI)
 libkubuntuupgradewizard_la_LDFLAGS = -L/usr/lib/debug $(all_libraries)
 
 INCLUDES = $(all_includes)
diff --git a/adept/manager/Makefile.am b/adept/manager/Makefile.am
index c32e0c1..58616c3 100644
--- a/adept/manager/Makefile.am
+++ b/adept/manager/Makefile.am
@@ -1,7 +1,7 @@
 bin_PROGRAMS = adept_manager
 noinst_HEADERS = app.h
 adept_manager_SOURCES = main.cpp app.cpp
-adept_manager_LDADD = ../adept/libadept.la -lapt-front $(LIBEPT_LIBS) $(TAGCOLL2_LIBS) $(LIBWIBBLE_LIBS) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_KIO) $(LIB_TDEUI)
+adept_manager_LDADD = ../adept/libadept.la -lapt-front $(LIBEPT_LIBS) $(TAGCOLL2_LIBS) $(LIBWIBBLE_LIBS) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEIO) $(LIB_TDEUI)
 adept_manager_LDFLAGS = -L/usr/lib/debug
 INCLUDES = $(all_includes) $(LIBAPT_FRONT_CFLAGS) $(LIBEPT_CFLAGS) $(TAGCOLL2_CFLAGS) $(LIBWIBBLE_CFLAGS) -I$(srcdir)/.. -I..
 KDE_CXXFLAGS = $(USE_EXCEPTIONS) -DQT_NO_ASCII_CAST -DQT_NO_CAST_ASCII
diff --git a/adept/notifier/Makefile.am b/adept/notifier/Makefile.am
index 54a5005..c9de4dc 100644
--- a/adept/notifier/Makefile.am
+++ b/adept/notifier/Makefile.am
@@ -4,7 +4,7 @@ bin_PROGRAMS = adept_notifier
 noinst_HEADERS = app.h
 
 adept_notifier_SOURCES = app.cpp
-adept_notifier_LDADD = ../adept/libadept.la $(LIBAPT_FRONT_LIBS) $(LIBEPT_LIBS) $(TAGCOLL2_LIBS) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_KIO) $(LIB_TDEUI)
+adept_notifier_LDADD = ../adept/libadept.la $(LIBAPT_FRONT_LIBS) $(LIBEPT_LIBS) $(TAGCOLL2_LIBS) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEIO) $(LIB_TDEUI)
 adept_notifier_LDFLAGS = -L/usr/lib/debug
 
 INCLUDES = $(all_includes) $(LIBAPT_FRONT_CFLAGS) $(LIBEPT_CFLAGS) $(TAGCOLL2_CFLAGS) $(LIBWIBBLE_CFLAGS) -I$(srcdir)/.. -I..
diff --git a/adept/updater/Makefile.am b/adept/updater/Makefile.am
index 3e924db..483f4e8 100644
--- a/adept/updater/Makefile.am
+++ b/adept/updater/Makefile.am
@@ -2,7 +2,7 @@
 bin_PROGRAMS = adept_updater
 noinst_HEADERS = app.h
 adept_updater_SOURCES = main.cpp app.cpp
-adept_updater_LDADD = ../adept/libadept.la $(LIBAPT_FRONT_LIBS) $(LIBEPT_LIBS) $(TAGCOLL2_LIBS) $(LIBWIBBLE_LIBS) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_KIO) $(LIB_TDEUI)
+adept_updater_LDADD = ../adept/libadept.la $(LIBAPT_FRONT_LIBS) $(LIBEPT_LIBS) $(TAGCOLL2_LIBS) $(LIBWIBBLE_LIBS) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEIO) $(LIB_TDEUI)
 adept_updater_LDFLAGS = -L/usr/lib/debug
 INCLUDES = $(all_includes) $(LIBAPT_FRONT_CFLAGS) $(LIBEPT_CFLAGS) $(TAGCOLL2_CFLAGS) $(LIBWIBBLE_CFLAGS) -I$(srcdir)/.. -I..
 KDE_CXXFLAGS = $(USE_EXCEPTIONS) -DQT_NO_ASCII_CAST -DQT_NO_CAST_ASCII
diff --git a/admin b/admin
index b4d585c..6b7f722 160000
--- a/admin
+++ b/admin
@@ -1 +1 @@
-Subproject commit b4d585c643d92787bfa17b935ce00b09960ee360
+Subproject commit 6b7f7225eff4c49b2dd71804d5fdacb03efcf461