diff --git a/Jamrules b/Jamrules
index d8a0920fa9..d7fe1550f3 100644
--- a/Jamrules
+++ b/Jamrules
@@ -45,6 +45,7 @@ if $(WARNINGS) {
 
 KERNEL_CCFLAGS ?= "-Wall -Wno-multichar -Wmissing-prototypes -finline -nostdinc" ;
 KERNEL_CCFLAGS += "-fno-builtin -D$(OBOS_TARGET_DEFINE) " ;
+KERNEL_CCFLAGS += "-DBOCHS_E9_HACK=$(BOCHS_E9_HACK) " ;
 
 AR = ar r ;
 OPTIM = -O2 ;
diff --git a/configure b/configure
index ec3a705018..63821d7ef3 100755
--- a/configure
+++ b/configure
@@ -16,7 +16,7 @@ Usage: $0 <options>
 options:
   --floppy <floppy location>    Specifies the location of the floppy
                                 (device or image).
-  --debug                       Activates bochs serial debug emulation.
+  --bochs-debug                 Activates bochs serial debug emulation.
   --help                        Prints out this help.
 EOF
 }
@@ -37,14 +37,14 @@ assertparam()
 #
 platform=`uname`
 floppy=
-debug=0
+bochs_debug=0
 
 # parse parameters
 #
 while [ $# \> 0 ] ; do
 	case "$1" in
 		--floppy)		assertparam "$1" $#; floppy=$2; shift 2;;
-		--debug)		debug=1; shift 1;;
+		--bochs-debug)		bochs_debug=1; shift 1;;
 		--help | -h)	usage; exit 0;;
 		*)				echo Invalid argument: \`$1\'; exit 1;;
 	esac
@@ -89,13 +89,6 @@ cat << EOF > BuildConfig
 
 FLOPPY_PATH	= "$floppy" ;
 GCC_PATH	= ${GCC_PATH} ;
-EOF
-
-# Generate bochs debug emulation hack header
-cat << EOF > headers/private/kernel/arch/bochs_hack.h
-// Bochs serial debug emulation hack definition
-// Note: This file has been automatically generated by configure.
-
-#define BOCHS_E9_HACK    $debug
+BOCHS_E9_HACK   = $bochs_debug ;
 EOF
 
diff --git a/src/kernel/core/arch/x86/arch_dbg_console.c b/src/kernel/core/arch/x86/arch_dbg_console.c
index abed139ed9..d806f8b578 100755
--- a/src/kernel/core/arch/x86/arch_dbg_console.c
+++ b/src/kernel/core/arch/x86/arch_dbg_console.c
@@ -10,8 +10,6 @@
 #include <arch/cpu.h>
 #include <arch/dbg_console.h>
 
-#include <arch/bochs_hack.h>
-
 #include <stage2.h>
 
 #include <string.h>