diff --git a/src/kernel/core/arch/x86/Jamfile b/src/kernel/core/arch/x86/Jamfile
index e6a9d077ac..ba2fbe0d6d 100644
--- a/src/kernel/core/arch/x86/Jamfile
+++ b/src/kernel/core/arch/x86/Jamfile
@@ -20,6 +20,7 @@ KernelStaticLibrary libx86 :
 	arch_x86.S
 	arch_interrupts.S
 	arch_system_info.c
+	arch_user_debugger.cpp
 	bios.cpp
 	cpuid.S
 	:
diff --git a/src/kernel/core/arch/x86/arch_user_debugger.cpp b/src/kernel/core/arch/x86/arch_user_debugger.cpp
new file mode 100644
index 0000000000..3bf61e78ea
--- /dev/null
+++ b/src/kernel/core/arch/x86/arch_user_debugger.cpp
@@ -0,0 +1,17 @@
+/*
+ * Copyright 2005, Ingo Weinhold, bonefish@users.sf.net.
+ * Distributed under the terms of the MIT License.
+ */
+
+#include <string.h>
+
+#include <debugger.h>
+#include <arch/user_debugger.h>
+#include <arch/thread.h>
+
+void
+arch_get_debug_cpu_state(struct debug_cpu_state *cpuState)
+{
+	struct iframe *frame = i386_get_current_iframe();
+	memcpy(cpuState, frame, sizeof(debug_cpu_state));
+}