Index: kernel/generic/src/console/cmd.c
===================================================================
--- kernel/generic/src/console/cmd.c	(revision 3f2177ec3c014007b443a285b62e08c76358c767)
+++ kernel/generic/src/console/cmd.c	(revision 92fd52d7f8133beb8043e6bcd17498477fe735ea)
@@ -65,5 +65,5 @@
 #include <ipc/ipc.h>
 #include <ipc/irq.h>
-#include <event/event.h>
+#include <ipc/event.h>
 #include <symtab.h>
 #include <errno.h>
Index: kernel/generic/src/console/console.c
===================================================================
--- kernel/generic/src/console/console.c	(revision 3f2177ec3c014007b443a285b62e08c76358c767)
+++ kernel/generic/src/console/console.c	(revision 92fd52d7f8133beb8043e6bcd17498477fe735ea)
@@ -42,5 +42,5 @@
 #include <ddi/irq.h>
 #include <ddi/ddi.h>
-#include <event/event.h>
+#include <ipc/event.h>
 #include <ipc/irq.h>
 #include <arch.h>
@@ -53,6 +53,6 @@
 #include <string.h>
 
-#define KLOG_SIZE     PAGE_SIZE
-#define KLOG_LENGTH   (KLOG_SIZE / sizeof(wchar_t))
+#define KLOG_PAGES    4
+#define KLOG_LENGTH   (KLOG_PAGES * PAGE_SIZE / sizeof(wchar_t))
 #define KLOG_LATENCY  8
 
@@ -96,5 +96,4 @@
 	
 	ASSERT((uintptr_t) faddr % FRAME_SIZE == 0);
-	ASSERT(KLOG_SIZE % FRAME_SIZE == 0);
 	
 	klog_parea.pbase = (uintptr_t) faddr;
@@ -103,5 +102,5 @@
 	
 	sysinfo_set_item_val("klog.faddr", NULL, (unative_t) faddr);
-	sysinfo_set_item_val("klog.pages", NULL, SIZE2FRAMES(sizeof(klog)));
+	sysinfo_set_item_val("klog.pages", NULL, KLOG_PAGES);
 	
 	spinlock_lock(&klog_lock);