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/conduits/abbrowserconduit/Makefile.am b/conduits/abbrowserconduit/Makefile.am
index f1cf64d..22fdbeb 100644
--- a/conduits/abbrowserconduit/Makefile.am
+++ b/conduits/abbrowserconduit/Makefile.am
@@ -11,7 +11,7 @@ conduit_address_la_SOURCES = \
 	abbrowser-setup.cc \
 	kabcRecord.cc \
 	abbrowser-conduit.cc
-conduit_address_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(PISOCK_LIB) $(LIB_QT) -ltdecore -lkio -ltdeui
+conduit_address_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(PISOCK_LIB) $(LIB_QT) -ltdecore -ltdeio -ltdeui
 conduit_address_la_LIBADD = ../../lib/libkpilot.la -lkabc -lkabc_file
 
 servicedir = $(kde_servicesdir)
diff --git a/conduits/docconduit/Makefile.am b/conduits/docconduit/Makefile.am
index 40b1a11..d7a3340 100644
--- a/conduits/docconduit/Makefile.am
+++ b/conduits/docconduit/Makefile.am
@@ -21,7 +21,7 @@ libpalmdoc_shared_la_LDFLAGS = $(PISOCK_LDFLAGS) $(PISOCK_LIB)
 libpalmdoc_shared_la_LIBADD = $(PISOCK_LDFLAGS) $(PISOCK_LIB)
 
 conduit_doc_la_SOURCES = docconduitSettings.kcfgc doc-factory.cc doc-setup.cc doc-conduit.cc doc-setupdialog.ui doc-conflictdialog.cc
-conduit_doc_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(PISOCK_LDFLAGS) $(PISOCK_LIB) $(LIB_QT) -ltdecore -lkio -ltdeui
+conduit_doc_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(PISOCK_LDFLAGS) $(PISOCK_LIB) $(LIB_QT) -ltdecore -ltdeio -ltdeui
 conduit_doc_la_LIBADD = ../../lib/libkpilot.la libpalmdoc_shared.la \
 	$(LIB_TDEUI) $(LIB_KFILE) $(PISOCK_LDFLAGS) $(PISOCK_LIB)
 
diff --git a/conduits/knotes/Makefile.am b/conduits/knotes/Makefile.am
index 6d1f7d1..5a9e8b6 100644
--- a/conduits/knotes/Makefile.am
+++ b/conduits/knotes/Makefile.am
@@ -15,7 +15,7 @@ conduit_knotes_la_SOURCES = \
 	knotes-action.cc \
 	setup_base.ui
 	
-conduit_knotes_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(PISOCK_LIB) $(LIB_QT) -ltdecore -lkio -ltdeui -lkcal
+conduit_knotes_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(PISOCK_LIB) $(LIB_QT) -ltdecore -ltdeio -ltdeui -lkcal
 conduit_knotes_la_LIBADD = ../../lib/libkpilot.la $(LIB_TDEUI)
 
 kde_kcfg_DATA = knotesconduit.kcfg
diff --git a/conduits/malconduit/Makefile.am b/conduits/malconduit/Makefile.am
index 6754bda..2a46ce8 100644
--- a/conduits/malconduit/Makefile.am
+++ b/conduits/malconduit/Makefile.am
@@ -13,6 +13,6 @@ kde_kcfg_DATA = malconduit.kcfg
 kde_module_LTLIBRARIES = conduit_mal.la
 
 conduit_mal_la_SOURCES = malconduitSettings.kcfgc mal-setup_dialog.ui mal-factory.cc mal-setup.cc mal-conduit.cc 
-conduit_mal_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(PISOCK_LIB) $(LIB_QT) -ltdecore -lkio -ltdeui
+conduit_mal_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(PISOCK_LIB) $(LIB_QT) -ltdecore -ltdeio -ltdeui
 conduit_mal_la_LIBADD = ../../lib/libkpilot.la $(MAL_LIB) $(LIB_TDEUI)
 
diff --git a/conduits/memofileconduit/Makefile.am b/conduits/memofileconduit/Makefile.am
index 4d61ba7..69e7f4b 100644
--- a/conduits/memofileconduit/Makefile.am
+++ b/conduits/memofileconduit/Makefile.am
@@ -10,7 +10,7 @@ kde_module_LTLIBRARIES = conduit_memofile.la
 
 conduit_memofile_la_SOURCES = memofileSettings.kcfgc setup_base.ui \
 	memofile-factory.cc memofile.cc memofiles.cc memofile-conduit.cc
-conduit_memofile_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(PISOCK_LIB) $(LIB_QT) -ltdecore -lkio -ltdeui
+conduit_memofile_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(PISOCK_LIB) $(LIB_QT) -ltdecore -ltdeio -ltdeui
 conduit_memofile_la_LIBADD = ../../lib/libkpilot.la $(LIB_TDEUI) $(LIB_KFILE)
 
 kde_kcfg_DATA = memofileconduit.kcfg
diff --git a/conduits/notepadconduit/Makefile.am b/conduits/notepadconduit/Makefile.am
index d66ea92..1e2c35c 100644
--- a/conduits/notepadconduit/Makefile.am
+++ b/conduits/notepadconduit/Makefile.am
@@ -9,6 +9,6 @@ kde_module_LTLIBRARIES = conduit_notepad.la
 
 conduit_notepad_la_SOURCES = notepadconduit.kcfgc notepad-setup.ui \
 	notepad-conduit.cc notepad-factory.cc
-conduit_notepad_la_LDFLAGS= -module $(KDE_PLUGIN) $(all_libraries) $(PISOCK_LIB) $(LIB_QT) -ltdecore -lkio -ltdeui
+conduit_notepad_la_LDFLAGS= -module $(KDE_PLUGIN) $(all_libraries) $(PISOCK_LIB) $(LIB_QT) -ltdecore -ltdeio -ltdeui
 conduit_notepad_la_LIBADD= ../../lib/libkpilot.la $(LIB_TDEUI) $(LIB_KIO)
 
diff --git a/conduits/null/Makefile.am b/conduits/null/Makefile.am
index 947182c..4851f52 100644
--- a/conduits/null/Makefile.am
+++ b/conduits/null/Makefile.am
@@ -9,7 +9,7 @@ kde_module_LTLIBRARIES = conduit_null.la
 
 
 conduit_null_la_SOURCES = nullSettings.kcfgc setup_base.ui null-conduit.cc null-factory.cc
-conduit_null_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(PISOCK_LIB) $(LIB_QT) -ltdecore -lkio -ltdeui
+conduit_null_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(PISOCK_LIB) $(LIB_QT) -ltdecore -ltdeio -ltdeui
 conduit_null_la_LIBADD = ../../lib/libkpilot.la $(LIB_TDEUI)
 
 kde_kcfg_DATA = nullconduit.kcfg
diff --git a/conduits/popmail/Makefile.am b/conduits/popmail/Makefile.am
index 07cfcdc..3a87f22 100644
--- a/conduits/popmail/Makefile.am
+++ b/conduits/popmail/Makefile.am
@@ -16,7 +16,7 @@ kde_module_LTLIBRARIES = conduit_popmail.la
 conduit_popmail_la_SOURCES = popmailSettings.kcfgc setup-dialog.ui \
 	popmail-factory.cc setupDialog.cc \
 	popmail-conduit.cc
-conduit_popmail_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(PISOCK_LIB) $(LIB_QT) -ltdecore -lkio -ltdeui -lDCOP
+conduit_popmail_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(PISOCK_LIB) $(LIB_QT) -ltdecore -ltdeio -ltdeui -lDCOP
 conduit_popmail_la_LIBADD  =  ../../lib/libkpilot.la $(LIB_KIO)
 
 # this option you can leave out. Just, if you use "make dist", you need it
diff --git a/conduits/recordconduit/Makefile.am b/conduits/recordconduit/Makefile.am
index 3a5ffbd..1ae2c59 100644
--- a/conduits/recordconduit/Makefile.am
+++ b/conduits/recordconduit/Makefile.am
@@ -9,7 +9,7 @@ kde_module_LTLIBRARIES = conduit_record.la
 
 
 conduit_record_la_SOURCES = settings.kcfgc setup_base.ui factory.cc
-conduit_record_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(PISOCK_LIB) $(LIB_QT) -ltdecore -lkio -ltdeui
+conduit_record_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(PISOCK_LIB) $(LIB_QT) -ltdecore -ltdeio -ltdeui
 conduit_record_la_LIBADD = ../../lib/libkpilot.la $(LIB_TDEUI)
 
 kde_kcfg_DATA = settings.kcfg
diff --git a/conduits/sysinfoconduit/Makefile.am b/conduits/sysinfoconduit/Makefile.am
index 1ea616d..b1f87be 100644
--- a/conduits/sysinfoconduit/Makefile.am
+++ b/conduits/sysinfoconduit/Makefile.am
@@ -15,7 +15,7 @@ conduit_sysinfo_la_SOURCES = sysinfoSettings.kcfgc \
 	sysinfo-setup.cc \
 	sysinfo-conduit.cc \
 	sysinfo-setup_dialog.ui
-conduit_sysinfo_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(PISOCK_LIB) $(LIB_QT) -ltdecore -lkio -ltdeui
+conduit_sysinfo_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(PISOCK_LIB) $(LIB_QT) -ltdecore -ltdeio -ltdeui
 conduit_sysinfo_la_LIBADD = ../../lib/libkpilot.la $(LIB_TDEUI) $(LIB_KIO)
 
 kpilot_sysinfo_data_DATA = Template.html Template.txt
diff --git a/conduits/timeconduit/Makefile.am b/conduits/timeconduit/Makefile.am
index 06894c4..a05d767 100644
--- a/conduits/timeconduit/Makefile.am
+++ b/conduits/timeconduit/Makefile.am
@@ -16,7 +16,7 @@ conduit_time_la_SOURCES = timeConduitSettings.kcfgc \
 	time-setup.cc \
 	time-conduit.cc \
 	time-setup_dialog.ui
-conduit_time_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(PISOCK_LIB) $(LIB_QT) -ltdecore -lkio -ltdeui
+conduit_time_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(PISOCK_LIB) $(LIB_QT) -ltdecore -ltdeio -ltdeui
 conduit_time_la_LIBADD = ../../lib/libkpilot.la $(LIB_TDEUI)
  
 kde_kcfg_DATA = timeconduit.kcfg
diff --git a/conduits/vcalconduit/Makefile.am b/conduits/vcalconduit/Makefile.am
index 0114bc8..4650af8 100644
--- a/conduits/vcalconduit/Makefile.am
+++ b/conduits/vcalconduit/Makefile.am
@@ -24,14 +24,14 @@ libvcalconduit_shared_la_SOURCES = vcalconduitSettings.kcfgc \
 
 conduit_vcal_la_SOURCES = vcal-conduit.cc vcalRecord.cc \
 	vcal-factory.cc vcal-setup.cc
-conduit_vcal_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(PISOCK_LIB) $(LIB_QT) -ltdecore -lkio -ltdeui -lkcal -ltderesources
+conduit_vcal_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(PISOCK_LIB) $(LIB_QT) -ltdecore -ltdeio -ltdeui -lkcal -ltderesources
 conduit_vcal_la_LIBADD = ../../lib/libkpilot.la \
 	libvcalconduit_shared.la
 conduit_vcal_la_COMPILE_FIRST = vcalconduitSettings.h korganizerConduit.h
 
 conduit_todo_la_SOURCES = todo-conduit.cc todoRecord.cc \
 	todo-factory.cc todo-setup.cc
-conduit_todo_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(PISOCK_LIB) $(LIB_QT) -ltdecore -lkio -ltdeui -lkcal -ltderesources
+conduit_todo_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(PISOCK_LIB) $(LIB_QT) -ltdecore -ltdeio -ltdeui -lkcal -ltderesources
 conduit_todo_la_LIBADD = ../../lib/libkpilot.la \
 	libvcalconduit_shared.la
 conduit_todo_la_COMPILE_FIRST = vcalconduitSettings.h korganizerConduit.h