diff --git a/admin b/admin
index b4d585c..6b7f722 160000
--- a/admin
+++ b/admin
@@ -1 +1 @@
-Subproject commit b4d585c643d92787bfa17b935ce00b09960ee360
+Subproject commit 6b7f7225eff4c49b2dd71804d5fdacb03efcf461
diff --git a/libk3b/core/Makefile.am b/libk3b/core/Makefile.am
index 2468d4f..06e474c 100644
--- a/libk3b/core/Makefile.am
+++ b/libk3b/core/Makefile.am
@@ -2,7 +2,7 @@ AM_CPPFLAGS = -I$(srcdir)/../../libk3bdevice -I$(srcdir)/../plugin -I$(srcdir)/.
 
 noinst_LTLIBRARIES = libk3bcore.la
 
-libk3bcore_la_LIBADD = $(LIB_KIO) $(ARTSC_LIB)
+libk3bcore_la_LIBADD = $(LIB_TDEIO) $(ARTSC_LIB)
 
 libk3bcore_la_LDFLAGS = $(all_libraries)
 
diff --git a/libk3bdevice/Makefile.am b/libk3bdevice/Makefile.am
index 4489660..912b980 100644
--- a/libk3bdevice/Makefile.am
+++ b/libk3bdevice/Makefile.am
@@ -6,7 +6,7 @@ METASOURCES = AUTO
 
 lib_LTLIBRARIES = libk3bdevice.la
 
-libk3bdevice_la_LIBADD = $(LIB_KIO) $(RESMGR_LIB) $(CAM_LIB) $(HAL_DBUS_LIBS) $(LIB_QT) $(LIB_TDECORE)
+libk3bdevice_la_LIBADD = $(LIB_TDEIO) $(RESMGR_LIB) $(CAM_LIB) $(HAL_DBUS_LIBS) $(LIB_QT) $(LIB_TDECORE)
 
 # lib version 5 for K3b 1.0
 libk3bdevice_la_LDFLAGS = $(all_libraries) -version-info 5:0:0 -no-undefined
diff --git a/plugins/decoder/libsndfile/Makefile.am b/plugins/decoder/libsndfile/Makefile.am
index 7c879c1..4148beb 100644
--- a/plugins/decoder/libsndfile/Makefile.am
+++ b/plugins/decoder/libsndfile/Makefile.am
@@ -4,7 +4,7 @@ kde_module_LTLIBRARIES = libk3blibsndfiledecoder.la
 
 libk3blibsndfiledecoder_la_SOURCES = k3blibsndfiledecoder.cpp
 
-libk3blibsndfiledecoder_la_LIBADD = ../../../libk3b/libk3b.la ../../../libk3bdevice/libk3bdevice.la ../../../libk3b/plugin/libk3bplugin.la $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KIO) -lsndfile
+libk3blibsndfiledecoder_la_LIBADD = ../../../libk3b/libk3b.la ../../../libk3bdevice/libk3bdevice.la ../../../libk3b/plugin/libk3bplugin.la $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) -lsndfile
 libk3blibsndfiledecoder_la_LDFLAGS = -avoid-version -module -no-undefined $(all_libraries)
 
 pluginsdir = $(kde_datadir)/k3b/plugins
diff --git a/plugins/decoder/musepack/Makefile.am b/plugins/decoder/musepack/Makefile.am
index f806ac5..63a3f74 100644
--- a/plugins/decoder/musepack/Makefile.am
+++ b/plugins/decoder/musepack/Makefile.am
@@ -7,7 +7,7 @@ kde_module_LTLIBRARIES = libk3bmpcdecoder.la
 
 libk3bmpcdecoder_la_SOURCES = k3bmpcdecoder.cpp k3bmpcwrapper.cpp
 
-libk3bmpcdecoder_la_LIBADD = ../../../libk3b/libk3b.la ../../../libk3bdevice/libk3bdevice.la ../../../libk3b/plugin/libk3bplugin.la $(MPC_LIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_KIO) $(LIB_TDEUI)
+libk3bmpcdecoder_la_LIBADD = ../../../libk3b/libk3b.la ../../../libk3bdevice/libk3bdevice.la ../../../libk3b/plugin/libk3bplugin.la $(MPC_LIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEIO) $(LIB_TDEUI)
 libk3bmpcdecoder_la_LDFLAGS = -avoid-version -module -no-undefined $(all_libraries)
 
 pluginsdir = $(kde_datadir)/k3b/plugins
diff --git a/plugins/decoder/ogg/Makefile.am b/plugins/decoder/ogg/Makefile.am
index 93efec4..c1f6137 100644
--- a/plugins/decoder/ogg/Makefile.am
+++ b/plugins/decoder/ogg/Makefile.am
@@ -5,7 +5,7 @@ kde_module_LTLIBRARIES = libk3boggvorbisdecoder.la
 libk3boggvorbisdecoder_la_SOURCES = k3boggvorbisdecoder.cpp
 
 libk3boggvorbisdecoder_la_LIBADD = ../../../libk3b/libk3b.la -logg -lvorbis -lvorbisfile 
-libk3boggvorbisdecoder_la_LIBADD = ../../../libk3b/libk3b.la ../../../libk3b/plugin/libk3bplugin.la ../../../libk3bdevice/libk3bdevice.la -logg -lvorbis -lvorbisfile $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KIO)
+libk3boggvorbisdecoder_la_LIBADD = ../../../libk3b/libk3b.la ../../../libk3b/plugin/libk3bplugin.la ../../../libk3bdevice/libk3bdevice.la -logg -lvorbis -lvorbisfile $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO)
 
 libk3boggvorbisdecoder_la_LDFLAGS = -avoid-version -module -no-undefined $(all_libraries)
 
diff --git a/src/Makefile.am b/src/Makefile.am
index 2b247e9..6744601 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -74,7 +74,7 @@ AM_CPPFLAGS = 	-I$(srcdir)/../libk3b/tools \
 METASOURCES = AUTO
 
 # the library search path.
-k3b_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+k3b_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 
 rcdir = $(kde_datadir)/k3b
 rc_DATA = k3bui.rc eventsrc tips
diff --git a/src/projects/kostore/Makefile.am b/src/projects/kostore/Makefile.am
index d99ae86..65de5e7 100644
--- a/src/projects/kostore/Makefile.am
+++ b/src/projects/kostore/Makefile.am
@@ -5,7 +5,7 @@ INCLUDES = $(all_includes)
 
 ####### Files
 
-libkostore_la_LIBADD = $(LIB_KIO)
+libkostore_la_LIBADD = $(LIB_TDEIO)
 libkostore_la_SOURCES = koStore.cc koZipStore.cc koStoreBase.cc
 #libkostore_la_LDFLAGS = $(all_libraries) -version-info 3:0:0 $(KDE_LDFLAGS) -no-undefined
 #include_HEADERS = koStore.h
diff --git a/tdefile-plugins/k3bproject/Makefile.am b/tdefile-plugins/k3bproject/Makefile.am
index 5d070e2..424c358 100644
--- a/tdefile-plugins/k3bproject/Makefile.am
+++ b/tdefile-plugins/k3bproject/Makefile.am
@@ -14,8 +14,8 @@ noinst_HEADERS   = tdefile_k3bprojectfileplugin.h
 kde_module_LTLIBRARIES = tdefile_k3b.la
 
 tdefile_k3b_la_SOURCES = tdefile_k3bprojectfileplugin.cpp
-tdefile_k3b_la_LDFLAGS = $(all_libraries) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KIO) -module $(KDE_PLUGIN)
-tdefile_k3b_la_LIBADD = $(LIB_KIO) ../../libk3b/libk3b.la ../../src/projects/kostore/libkostore.la
+tdefile_k3b_la_LDFLAGS = $(all_libraries) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) -module $(KDE_PLUGIN)
+tdefile_k3b_la_LIBADD = $(LIB_TDEIO) ../../libk3b/libk3b.la ../../src/projects/kostore/libkostore.la
 
 # let automoc handle all of the meta source files (moc)
 METASOURCES = AUTO
diff --git a/tdeioslaves/videodvd/videodvd.protocol b/tdeioslaves/videodvd/videodvd.protocol
index cae5749..f4d5403 100644
--- a/tdeioslaves/videodvd/videodvd.protocol
+++ b/tdeioslaves/videodvd/videodvd.protocol
@@ -19,7 +19,7 @@ Description[de]=Ein-/Ausgabemodul, mit dem man Dateien von einer Video-DVD kopie
 Description[el]=Ένα tdeioslave που επιτρέπει την αντιγραφή αρχείων από ένα DVD βίντεο (δυνατότητα αποκρυπτογράφησης)
 Description[eo]=Kioslave kiu permesas kopii dosierojn el videa DVD (inklude malĉifro)
 Description[es]=Un tdeioslave que permite copiar archivos de un DVD de vídeo (incluye descifrado)
-Description[et]=KIO-moodul, mis võimaldab kopeerida faile video DVD-lt (vajadusel dekrüpteerib)
+Description[et]=TDEIO-moodul, mis võimaldab kopeerida faile video DVD-lt (vajadusel dekrüpteerib)
 Description[fa]=یک tdeioslave که اجازه می‌دهد پرونده‌ها از یک دی وی دی ویدئویی )شامل سرگشایی( رونوشت شوند
 Description[fi]=Kioslave-palvelu, joka mahdollistaa tiedostojen purkamisen dvd-levyltä.
 Description[fr]=Un tdeioslave qui permet de copier des fichiers depuis un DVD Vidéo (incluant le déchiffrement)