Index: uspace/kbd/arch/ia32/include/kbd.h
===================================================================
--- uspace/kbd/arch/ia32/include/kbd.h	(revision 494a54a94c94c36c914cea4c0ea06f357a70a108)
+++ uspace/kbd/arch/ia32/include/kbd.h	(revision 95b355086cd805dc6f9cc96f44fa2ef92cecd8b5)
@@ -43,7 +43,4 @@
 #include <libarch/ddi.h>
 
-#define KBD_IRQ      1
-#define MOUSE_IRQ    12
-
 #define i8042_DATA      0x60
 #define i8042_STATUS    0X64
Index: uspace/kbd/arch/ia32/src/kbd.c
===================================================================
--- uspace/kbd/arch/ia32/src/kbd.c	(revision 494a54a94c94c36c914cea4c0ea06f357a70a108)
+++ uspace/kbd/arch/ia32/src/kbd.c	(revision 95b355086cd805dc6f9cc96f44fa2ef92cecd8b5)
@@ -43,4 +43,5 @@
 #include <keys.h>
 #include <genarch/kbd.h>
+#include <sysinfo.h>
 
 /* Interesting bits for status register */
@@ -70,6 +71,6 @@
 
 irq_cmd_t i8042_cmds[2] = {
-	{ CMD_PORT_READ_1, (void *)0x64, 0, 1 },
-	{ CMD_PORT_READ_1, (void *)0x60, 0, 2 }
+	{ CMD_PORT_READ_1, (void *) 0x64, 0, 1 },
+	{ CMD_PORT_READ_1, (void *) 0x60, 0, 2 }
 };
 
@@ -92,5 +93,5 @@
 	int mouseenabled = 0;
 
-	iospace_enable(task_get_id(),(void *)i8042_DATA, 5);
+	iospace_enable(task_get_id(), (void *) i8042_DATA, 5);
 	/* Disable kbd, enable mouse */
 	i8042_command_write(i8042_CMD_KBD);
@@ -125,11 +126,9 @@
 		/* enable mouse */
 		mouseenabled = 1;
-
-		ipc_register_irq(MOUSE_IRQ, &i8042_kbd);
+		
+		ipc_register_irq(sysinfo_value("mouse.inr"), sysinfo_value("mouse.devno"), 0, &i8042_kbd);
 	}
 	/* Enable kbd */
-	ipc_register_irq(KBD_IRQ, &i8042_kbd);
-	/* Register for irq restart */
-	ipc_register_irq(IPC_IRQ_KBDRESTART, NULL);
+	ipc_register_irq(sysinfo_value("kbd.inr"), sysinfo_value("kbd.devno"), 0, &i8042_kbd);
 
 	int newcontrol = i8042_KBD_IE | i8042_KBD_TRANSLATE;
@@ -150,9 +149,4 @@
 	int status = IPC_GET_ARG1(*call);
 
-	if (IPC_GET_METHOD(*call) == IPC_IRQ_KBDRESTART) {
-		kbd_arch_init();
-		return 1;
-	}
-
 	if ((status & i8042_MOUSE_DATA))
 		return 0;