diff --git a/.config b/.config
index 76c64af0..eade201a 100644
--- a/.config
+++ b/.config
@@ -2,3 +2,4 @@
 CONFIG_EARLY_VIRT_MEM=8
 CONFIG_LIBPFM=n
 CONFIG_ACPICA=y
+CONFIG_DEBUG=n
diff --git a/Makefile b/Makefile
index 2d3a5dd9..1ed62668 100644
--- a/Makefile
+++ b/Makefile
@@ -109,6 +109,10 @@ endif
 
 COMMON_FLAGS := $(COMMON_INCLUDES) -pipe -MP -MMD -m64 -D__x86_64__ -D__KTF__ -DEARLY_VIRT_MEM=$(CONFIG_EARLY_VIRT_MEM)
 
+ifeq ($(CONFIG_DEBUG),y)
+COMMON_FLAGS += -DKTF_DEBUG
+endif
+
 ifeq ($(CONFIG_LIBPFM),y)
 COMMON_FLAGS += -DKTF_PMU
 endif
diff --git a/common/cmdline.c b/common/cmdline.c
index 385b9332..de3813e5 100644
--- a/common/cmdline.c
+++ b/common/cmdline.c
@@ -28,7 +28,11 @@
 #include <mm/regions.h>
 #include <string.h>
 
+#ifdef KTF_DEBUG
+bool opt_debug = true;
+#else
 bool opt_debug = false;
+#endif
 bool_cmd("debug", opt_debug);
 
 bool opt_keyboard = true;
diff --git a/common/kernel.c b/common/kernel.c
index b47d42cd..51342e4f 100644
--- a/common/kernel.c
+++ b/common/kernel.c
@@ -51,14 +51,13 @@ static void __noreturn echo_loop(void) {
 }
 
 void kernel_main(void) {
-    printk("\nKTF - Kernel Test Framework!\n\n");
-
-    if (kernel_cmdline)
-        printk("Command line: %s\n", kernel_cmdline);
+    printk("\nKTF - Kernel Test Framework!\n");
 
     zap_boot_mappings();
-    display_memory_map();
-    display_multiboot_mmap();
+    if (opt_debug) {
+        display_memory_map();
+        display_multiboot_mmap();
+    }
 
     test_main();
 
diff --git a/common/setup.c b/common/setup.c
index b71f1d93..022f0575 100644
--- a/common/setup.c
+++ b/common/setup.c
@@ -150,6 +150,8 @@ void __noreturn __text_init kernel_start(uint32_t multiboot_magic,
 
     /* Parse commandline parameters */
     cmdline_parse(kernel_cmdline);
+    if (!string_empty(kernel_cmdline))
+        printk("Command line: %s\n", kernel_cmdline);
 
     /* Initialize console early */
     init_console();
diff --git a/drivers/acpi/acpica/acktf.h b/drivers/acpi/acpica/acktf.h
index 0913097d..4abe6611 100644
--- a/drivers/acpi/acpica/acktf.h
+++ b/drivers/acpi/acpica/acktf.h
@@ -55,7 +55,9 @@
 
 /* Kernel specific ACPICA configuration */
 
+#ifdef KTF_DEBUG
 #define ACPI_DEBUG_OUTPUT
+#endif
 
 #include <spinlock.h>
 #include <string.h>
diff --git a/drivers/keyboard.c b/drivers/keyboard.c
index 9da594b3..0c2e072e 100644
--- a/drivers/keyboard.c
+++ b/drivers/keyboard.c
@@ -64,7 +64,7 @@ static keyboard_state_t keyboard_state;
 
 void init_keyboard(uint8_t dst_cpus) {
     if (!boot_flags.i8042) {
-        printk("No i8042 microcontroller detected\n");
+        dprintk("No i8042 microcontroller detected\n");
         return;
     }