diff --git a/src/ldappasswddlg.cpp b/src/ldappasswddlg.cpp
index 444e909..bf20404 100644
--- a/src/ldappasswddlg.cpp
+++ b/src/ldappasswddlg.cpp
@@ -22,7 +22,7 @@
 #include <klineedit.h>
 #include <ktextedit.h>
 #include <knuminput.h>
-#include <kactionselector.h>
+#include <tdeactionselector.h>
 #include <tqlistbox.h>
 #include <kpushbutton.h>
 #include <tqpixmap.h>
diff --git a/src/libtdeldap.cpp b/src/libtdeldap.cpp
index 5c79891..2e4cd4a 100644
--- a/src/libtdeldap.cpp
+++ b/src/libtdeldap.cpp
@@ -987,7 +987,7 @@ int LDAPManager::setPasswordForUser(LDAPUserInfo user, TQString *errstr) {
 	return 1;	// Failure
 }
 
-TQString klistDateTimeToRFCDateTime(TQString datetime) {
+TQString tdelistDateTimeToRFCDateTime(TQString datetime) {
 	// HACK HACK HACK
 	// FIXME
 	TQString ret;
@@ -1015,7 +1015,7 @@ TQString klistDateTimeToRFCDateTime(TQString datetime) {
 #define KLIST_STOPTIME_STRING "End time: "
 #define KLIST_FLAGS_STRING "Ticket flags: "
 #define KLIST_ADDRESSES_STRING "Ticket flags: "
-#define KLIST_NO_TICKET_FILE "klist: No ticket file: "
+#define KLIST_NO_TICKET_FILE "tdelist: No ticket file: "
 #define KLIST_KVNO_STRING "kvno"
 
 #define KLIST_ADDRESSLESS_STRING "addressless"
@@ -1048,10 +1048,10 @@ KerberosTicketInfoList LDAPManager::getKerberosTicketList(TQString cache, TQStri
 	TQString line;
 	FILE *output;
 	if (cache != "") {
-		output = popen((TQString("klist --cache=%1 -v 2>&1").arg(cache)).ascii(), "r");
+		output = popen((TQString("tdelist --cache=%1 -v 2>&1").arg(cache)).ascii(), "r");
 	}
 	else {
-		output = popen("klist -v 2>&1", "r");
+		output = popen("tdelist -v 2>&1", "r");
 	}
 	TQFile f;
 	f.open(IO_ReadOnly, output);
@@ -1117,7 +1117,7 @@ KerberosTicketInfoList LDAPManager::getKerberosTicketList(TQString cache, TQStri
 			line.remove(0, strlen(KLIST_AUTHTIME_STRING));
 			line.replace("(expired)", "");
 			line = line.simplifyWhiteSpace();
-			line = klistDateTimeToRFCDateTime(line);
+			line = tdelistDateTimeToRFCDateTime(line);
 			ticket.authenticationTime.setTime_t(KRFCDate::parseDate(line));
 			ticket.informationValid = true;
 		}
@@ -1125,7 +1125,7 @@ KerberosTicketInfoList LDAPManager::getKerberosTicketList(TQString cache, TQStri
 			line.remove(0, strlen(KLIST_STARTTIME_STRING));
 			line.replace("(expired)", "");
 			line = line.simplifyWhiteSpace();
-			line = klistDateTimeToRFCDateTime(line);
+			line = tdelistDateTimeToRFCDateTime(line);
 			ticket.validStartTime.setTime_t(KRFCDate::parseDate(line));
 			ticket.informationValid = true;
 		}
@@ -1133,7 +1133,7 @@ KerberosTicketInfoList LDAPManager::getKerberosTicketList(TQString cache, TQStri
 			line.remove(0, strlen(KLIST_STOPTIME_STRING));
 			line.replace("(expired)", "");
 			line = line.simplifyWhiteSpace();
-			line = klistDateTimeToRFCDateTime(line);
+			line = tdelistDateTimeToRFCDateTime(line);
 			ticket.validEndTime.setTime_t(KRFCDate::parseDate(line));
 			ticket.informationValid = true;
 		}