diff --git a/src/bin/gdb/config.sub b/src/bin/gdb/config.sub
index edb6b663ca..36a7851923 100755
--- a/src/bin/gdb/config.sub
+++ b/src/bin/gdb/config.sub
@@ -1297,6 +1297,9 @@ case $os in
 	-kaos*)
 		os=-kaos
 		;;
+	-haiku*)
+		os=-haiku
+		;;
 	-none)
 		;;
 	*)
diff --git a/src/bin/gdb/gdb/configure.host b/src/bin/gdb/gdb/configure.host
index f730891162..867bef11bc 100644
--- a/src/bin/gdb/gdb/configure.host
+++ b/src/bin/gdb/gdb/configure.host
@@ -86,6 +86,7 @@ i[34567]86-*-unixware*)	gdb_host=i386v4 ;;
 i[34567]86-*-sysv*)	gdb_host=i386v ;;
 i[34567]86-*-isc*)	gdb_host=i386v ;;
 i[34567]86-*-cygwin*)	gdb_host=cygwin ;;
+i[567]86-*-haiku*)	gdb_host=haiku ;;
 
 ia64-*-aix*)		gdb_host=aix ;;
 ia64-*-linux*)		gdb_host=linux ;;
diff --git a/src/bin/gdb/gdb/configure.tgt b/src/bin/gdb/gdb/configure.tgt
index 0b1f627960..93ca8aeab1 100644
--- a/src/bin/gdb/gdb/configure.tgt
+++ b/src/bin/gdb/gdb/configure.tgt
@@ -98,6 +98,7 @@ i[34567]86-*-netware*)	gdb_target=i386
 			configdirs="${configdirs} nlm" ;;
 i[34567]86-*-cygwin*)	gdb_target=cygwin  ;;
 i[34567]86-*-vxworks*)	gdb_target=vxworks ;;
+i[34567]86-*-haiku*)	gdb_target=haiku ;;
 i[34567]86-*-*)		gdb_target=i386 ;;
 
 ia64-*-aix*)		gdb_target=aix ;;