diff --git a/src/kernel/core/Jamfile b/src/kernel/core/Jamfile
index 3ee68e599f..5178fc05b2 100644
--- a/src/kernel/core/Jamfile
+++ b/src/kernel/core/Jamfile
@@ -60,6 +60,7 @@ SubInclude OBOS_TOP src kernel core addons ;
 SubInclude OBOS_TOP src kernel core arch ;
 SubInclude OBOS_TOP src kernel core cache ;
 SubInclude OBOS_TOP src kernel core device_manager ;
+SubInclude OBOS_TOP src kernel core debug ;
 SubInclude OBOS_TOP src kernel core disk_device_manager ;
 SubInclude OBOS_TOP src kernel core fs ;
 SubInclude OBOS_TOP src kernel core messaging ;
diff --git a/src/kernel/core/console.c b/src/kernel/core/console.c
index c36e6e9fe8..ff0291e43d 100644
--- a/src/kernel/core/console.c
+++ b/src/kernel/core/console.c
@@ -11,26 +11,16 @@
 
 #include <OS.h>
 #include <KernelExport.h>
+
 #include <boot/kernel_args.h>
 #include <console.h>
+#include <frame_buffer_console.h>
 
 #include <stdarg.h>
 #include <stdio.h>
 #include <unistd.h>
 
 
-// ToDo: this mechanism will be changed so that these lines can go away
-#ifdef ARCH_x86
-#	include <arch/x86/console_dev.h>
-#else
-enum {
-	CONSOLE_OP_WRITEXY = 2376
-};
-#endif
-
-
-#include <fb_console.h>
-
 
 struct console_op_xy_struct {
 	int x;
@@ -57,7 +47,7 @@ kprintf(const char *fmt, ...)
 	}
 }
 
-
+#if 0
 void
 kprintf_xy(int x, int y, const char *fmt, ...)
 {
@@ -75,18 +65,11 @@ kprintf_xy(int x, int y, const char *fmt, ...)
 		ioctl(console_fd, CONSOLE_OP_WRITEXY, &buf, ret + sizeof(buf.x) + sizeof(buf.y));
 	}
 }
-
+#endif
 
 int
 con_init(kernel_args *args)
 {
-	/* now run the oddballs we have, consoles at present */
-	// ToDo: this mechanism will be changed so that these lines can go away
-#ifdef ARCH_x86
-	console_dev_init(args);
-#endif
-	fb_console_dev_init(args);
-
-	console_fd = open("/dev/console", O_RDWR);
-	return console_fd >= 0;
+	frame_buffer_console_init(args);
+	return B_OK;
 }
diff --git a/src/kernel/core/module.c b/src/kernel/core/module.c
index f116b201e0..c659c572b0 100644
--- a/src/kernel/core/module.c
+++ b/src/kernel/core/module.c
@@ -43,6 +43,7 @@
 extern module_info gDeviceManagerModule;
 extern module_info gDeviceRootModule;
 extern module_info gDeviceForDriversModule;
+extern module_info gFrameBufferConsoleModule;
 
 // file systems
 extern module_info gRootFileSystem;
@@ -54,6 +55,7 @@ static module_info *sBuiltInModules[] = {
 	&gDeviceManagerModule,
 	&gDeviceRootModule,
 	&gDeviceForDriversModule,
+	&gFrameBufferConsoleModule,
 
 	&gRootFileSystem,
 	&gDeviceFileSystem,