diff --git a/hw/kdrive/src/kinput.c b/hw/kdrive/src/kinput.c
index b415a86fe..4119b083b 100644
--- a/hw/kdrive/src/kinput.c
+++ b/hw/kdrive/src/kinput.c
@@ -146,7 +146,7 @@ static void
 KdAddFd(int fd, int i)
 {
     KdNonBlockFd(fd);
-    SetNotifyFd(fd, KdNotifyFd, X_NOTIFY_READ, (void *) (intptr_t) i);
+    InputThreadRegisterDev(fd, KdNotifyFd, (void *) (intptr_t) i);
 }
 
 static void
@@ -154,7 +154,7 @@ KdRemoveFd(int fd)
 {
     int flags;
 
-    RemoveNotifyFd(fd);
+    InputThreadUnregisterDev(fd);
     flags = fcntl(fd, F_GETFL);
     flags &= ~(FASYNC | NOBLOCK);
     fcntl(fd, F_SETFL, flags);
@@ -1306,6 +1306,8 @@ KdInitInput(void)
     KdKeyboardInfo *ki;
     struct KdConfigDevice *dev;
 
+    InputThreadPreInit();
+
     kdInputEnabled = TRUE;
 
     for (dev = kdConfigPointers; dev; dev = dev->next) {