diff --git a/hw/xnest/Init.c b/hw/xnest/Init.c
index 49a52d776..0765f73d0 100644
--- a/hw/xnest/Init.c
+++ b/hw/xnest/Init.c
@@ -89,14 +89,19 @@ InitOutput(ScreenInfo *screenInfo, int argc, char *argv[])
 void
 InitInput(int argc, char *argv[])
 {
-  xnestPointerDevice = AddInputDevice(serverClient, xnestPointerProc, TRUE);
-  xnestKeyboardDevice = AddInputDevice(serverClient, xnestKeyboardProc, TRUE);
+  int rc;
+  rc = AllocDevicePair(serverClient, "Xnest",
+                       &xnestPointerDevice,
+                       &xnestKeyboardDevice,
+                       xnestPointerProc,
+                       xnestKeyboardProc,
+                       FALSE);
+
+  if (rc != Success)
+      FatalError("Failed to init Xnest default devices.\n");
 
   GetEventList(&xnestEvents);
 
-  RegisterPointerDevice(xnestPointerDevice);
-  RegisterKeyboardDevice(xnestKeyboardDevice);
-
   mieqInit();
 
   AddEnabledDevice(XConnectionNumber(xnestDisplay));