diff --git a/src/bin/gdb/gdb/config/i386/haiku.mh b/src/bin/gdb/gdb/config/i386/haiku.mh
new file mode 100644
index 0000000000..d4212dbd1f
--- /dev/null
+++ b/src/bin/gdb/gdb/config/i386/haiku.mh
@@ -0,0 +1,7 @@
+# Host: Intel 586 running Haiku
+
+NAT_FILE= nm-haiku.h
+NATDEPFILES= haiku-nat.o i386-haiku-nat.o inf-child.o fork-child.o
+
+# No core file support yet.
+# corelow.o core-aout.o
diff --git a/src/bin/gdb/gdb/config/i386/haiku.mt b/src/bin/gdb/gdb/config/i386/haiku.mt
new file mode 100644
index 0000000000..e60affb016
--- /dev/null
+++ b/src/bin/gdb/gdb/config/i386/haiku.mt
@@ -0,0 +1,5 @@
+# Target: Intel 586 running Haiku
+
+TDEPFILES= i386-tdep.o i386-haiku-tdep.o haiku-tdep.o i387-tdep.o \
+	solib.o solib-haiku.o symfile-mem.o
+DEPRECATED_TM_FILE= tm-haiku.h