diff --git a/arch/x86/include/asm/kb.h b/arch/x86/include/asm/kb.h
index 633d0768..27e0b476 100644
--- a/arch/x86/include/asm/kb.h
+++ b/arch/x86/include/asm/kb.h
@@ -26,7 +26,9 @@
 extern "C" {
 #endif
 
+#ifdef USE_KEYBOARD
 void keyboard_init(void);
+#endif
 
 #ifdef __cplusplus
 }
diff --git a/arch/x86/kernel/kb.c b/arch/x86/kernel/kb.c
index fe45b778..3fab337d 100644
--- a/arch/x86/kernel/kb.c
+++ b/arch/x86/kernel/kb.c
@@ -22,6 +22,8 @@
 #include <asm/kb.h>
 #include <asm/irq.h>
 
+#ifdef USE_KEYBOARD
+
 /* 
  * KBDUS means US Keyboard Layout. This is a scancode table
  * used to layout a standard US keyboard. I have left some
@@ -105,3 +107,5 @@ void keyboard_init(void)
 {
 	irq_install_handler(1, keyboard_handler);
 }
+
+#endif
diff --git a/kernel/main.c b/kernel/main.c
index 886dc648..3f733939 100644
--- a/kernel/main.c
+++ b/kernel/main.c
@@ -51,7 +51,9 @@ int main(void)
 	irq_init();
 	koutput_init();
 	timer_init();
+#ifdef USE_KEYBOARD
 	keyboard_init();
+#endif
 	mmu_init();
 	multitasking_init();