diff --git a/acinclude.m4 b/acinclude.m4
index 24308b3..daad1dc 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -2070,7 +2070,7 @@ 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, "-lkio")
+   AC_SUBST(LIB_KIO, "-ltdeio")
    AC_SUBST(LIB_KJS, "-lkjs")
    AC_SUBST(LIB_SMB, "-lsmb")
    AC_SUBST(LIB_KAB, "-lkab")
@@ -2086,12 +2086,12 @@ if test $kde_qtver = 3; then
    AC_SUBST(LIB_KDNSSD, "-ltdednssd")
    AC_SUBST(LIB_KUNITTEST, "-ltdeunittest")
 # these are for backward compatibility
-   AC_SUBST(LIB_KSYCOCA, "-lkio")
-   AC_SUBST(LIB_KFILE, "-lkio")
+   AC_SUBST(LIB_KSYCOCA, "-ltdeio")
+   AC_SUBST(LIB_KFILE, "-ltdeio")
 elif test $kde_qtver = 2; then
    AC_SUBST(LIB_TDECORE, "-ltdecore")
    AC_SUBST(LIB_TDEUI, "-ltdeui")
-   AC_SUBST(LIB_KIO, "-lkio")
+   AC_SUBST(LIB_KIO, "-ltdeio")
    AC_SUBST(LIB_KSYCOCA, "-ltdesycoca")
    AC_SUBST(LIB_SMB, "-lsmb")
    AC_SUBST(LIB_KFILE, "-ltdefile")
diff --git a/admin b/admin
index b6d5b67..b234091 160000
--- a/admin
+++ b/admin
@@ -1 +1 @@
-Subproject commit b6d5b675493a44e3e789cc914da0d18914d2bb39
+Subproject commit b2340915fde2845f481d9aad9e5e89820fbfedca
diff --git a/doc/Makefile b/doc/Makefile
index 194c86d..5035d07 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -160,16 +160,16 @@ LIB_TDEPIM = -ltdepim
 LIB_TDEPRINT = -ltdeprint
 LIB_TDEUI = -ltdeui
 LIB_KDNSSD = -ltdednssd
-LIB_KFILE = -lkio
+LIB_KFILE = -ltdeio
 LIB_KFM = 
 LIB_TDEHTML = -ltdehtml
 LIB_KIMPROXY = -ltdeimproxy
-LIB_KIO = -lkio
+LIB_KIO = -ltdeio
 LIB_KJS = -lkjs
 LIB_KNEWSTUFF = -lknewstuff
 LIB_KPARTS = -ltdeparts
 LIB_KSPELL = -ltdespell
-LIB_KSYCOCA = -lkio
+LIB_KSYCOCA = -ltdeio
 LIB_KUNITTEST = -ltdeunittest
 LIB_KUTILS = -ltdeutils
 LIB_POLL = 
diff --git a/doc/kmyfirewall/Makefile b/doc/kmyfirewall/Makefile
index 5e73135..39d5f48 100644
--- a/doc/kmyfirewall/Makefile
+++ b/doc/kmyfirewall/Makefile
@@ -144,16 +144,16 @@ LIB_TDEPIM = -ltdepim
 LIB_TDEPRINT = -ltdeprint
 LIB_TDEUI = -ltdeui
 LIB_KDNSSD = -ltdednssd
-LIB_KFILE = -lkio
+LIB_KFILE = -ltdeio
 LIB_KFM = 
 LIB_TDEHTML = -ltdehtml
 LIB_KIMPROXY = -ltdeimproxy
-LIB_KIO = -lkio
+LIB_KIO = -ltdeio
 LIB_KJS = -lkjs
 LIB_KNEWSTUFF = -lknewstuff
 LIB_KPARTS = -ltdeparts
 LIB_KSPELL = -ltdespell
-LIB_KSYCOCA = -lkio
+LIB_KSYCOCA = -ltdeio
 LIB_KUNITTEST = -ltdeunittest
 LIB_KUTILS = -ltdeutils
 LIB_POLL = 
diff --git a/kmyfirewall/installer/openbsd/Makefile b/kmyfirewall/installer/openbsd/Makefile
index edc3f9c..f081944 100644
--- a/kmyfirewall/installer/openbsd/Makefile
+++ b/kmyfirewall/installer/openbsd/Makefile
@@ -198,16 +198,16 @@ LIB_TDEPIM = -ltdepim
 LIB_TDEPRINT = -ltdeprint
 LIB_TDEUI = -ltdeui
 LIB_KDNSSD = -ltdednssd
-LIB_KFILE = -lkio
+LIB_KFILE = -ltdeio
 LIB_KFM = 
 LIB_TDEHTML = -ltdehtml
 LIB_KIMPROXY = -ltdeimproxy
-LIB_KIO = -lkio
+LIB_KIO = -ltdeio
 LIB_KJS = -lkjs
 LIB_KNEWSTUFF = -lknewstuff
 LIB_KPARTS = -ltdeparts
 LIB_KSPELL = -ltdespell
-LIB_KSYCOCA = -lkio
+LIB_KSYCOCA = -ltdeio
 LIB_KUNITTEST = -ltdeunittest
 LIB_KUTILS = -ltdeutils
 LIB_POLL =