diff --git a/gnu/usr.bin/binutils/gdb/fbsd-kgdb-alpha.h b/gnu/usr.bin/binutils/gdb/fbsd-kgdb-alpha.h
new file mode 100644
index 00000000000..90dbc146332
--- /dev/null
+++ b/gnu/usr.bin/binutils/gdb/fbsd-kgdb-alpha.h
@@ -0,0 +1,11 @@
+/* $FreeBSD$ */
+
+#ifndef FBSD_KGDB_ALPHA_H
+#define FBSD_KGDB_ALPHA_H
+
+#undef  FRAME_SAVED_PC
+#define FRAME_SAVED_PC(FRAME) \
+  (kernel_debugging ? fbsd_kern_frame_saved_pc(FRAME) : \
+		      alpha_saved_pc_after_call(FRAME))
+ 
+#endif /* FBSD_KGDB_ALPHA_H */
diff --git a/gnu/usr.bin/binutils/gdb/fbsd-kgdb-arm.h b/gnu/usr.bin/binutils/gdb/fbsd-kgdb-arm.h
new file mode 100644
index 00000000000..1d7afed7c02
--- /dev/null
+++ b/gnu/usr.bin/binutils/gdb/fbsd-kgdb-arm.h
@@ -0,0 +1,6 @@
+/* $FreeBSD$ */
+
+#ifndef FBSD_KGDB_ARM_H
+#define FBSD_KGDB_ARM_H
+
+#endif /* FBSD_KGDB_ARM_H */
diff --git a/gnu/usr.bin/binutils/gdb/fbsd-kgdb-i386.h b/gnu/usr.bin/binutils/gdb/fbsd-kgdb-i386.h
new file mode 100644
index 00000000000..45fae7db309
--- /dev/null
+++ b/gnu/usr.bin/binutils/gdb/fbsd-kgdb-i386.h
@@ -0,0 +1,6 @@
+/* $FreeBSD$ */
+
+#ifndef FBSD_KGDB_I386_H
+#define FBSD_KGDB_I386_H
+
+#endif /* FBSD_KGDB_I386_H */
diff --git a/gnu/usr.bin/binutils/gdb/fbsd-kgdb-ia64.h b/gnu/usr.bin/binutils/gdb/fbsd-kgdb-ia64.h
new file mode 100644
index 00000000000..3a795759026
--- /dev/null
+++ b/gnu/usr.bin/binutils/gdb/fbsd-kgdb-ia64.h
@@ -0,0 +1,6 @@
+/* $FreeBSD$ */
+
+#ifndef FBSD_KGDB_IA64_H
+#define FBSD_KGDB_IA64_H
+
+#endif /* FBSD_KGDB_IA64_H */
diff --git a/gnu/usr.bin/binutils/gdb/fbsd-kgdb-powerpc.h b/gnu/usr.bin/binutils/gdb/fbsd-kgdb-powerpc.h
new file mode 100644
index 00000000000..64b2bc7cc8d
--- /dev/null
+++ b/gnu/usr.bin/binutils/gdb/fbsd-kgdb-powerpc.h
@@ -0,0 +1,6 @@
+/* $FreeBSD$ */
+
+#ifndef FBSD_KGDB_POWERPC_H
+#define FBSD_KGDB_POWERPC_H
+
+#endif /* FBSD_KGDB_POWERPC_H */
diff --git a/gnu/usr.bin/binutils/gdb/fbsd-kgdb-sparc64.h b/gnu/usr.bin/binutils/gdb/fbsd-kgdb-sparc64.h
new file mode 100644
index 00000000000..4b37697101f
--- /dev/null
+++ b/gnu/usr.bin/binutils/gdb/fbsd-kgdb-sparc64.h
@@ -0,0 +1,6 @@
+/* $FreeBSD$ */
+
+#ifndef FBSD_KGDB_SPARC64_H
+#define FBSD_KGDB_SPARC64_H
+
+#endif /* FBSD_KGDB_SPARC64_H */
diff --git a/gnu/usr.bin/binutils/gdb/fbsd-kgdb-x86_64.h b/gnu/usr.bin/binutils/gdb/fbsd-kgdb-x86_64.h
new file mode 100644
index 00000000000..6cf4ba0fd87
--- /dev/null
+++ b/gnu/usr.bin/binutils/gdb/fbsd-kgdb-x86_64.h
@@ -0,0 +1,6 @@
+/* $FreeBSD$ */
+
+#ifndef FBSD_KGDB_X86_64_H
+#define FBSD_KGDB_X86_64_H
+
+#endif /* FBSD_KGDB_X86_64_H */