diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 3a0b8e1c52f..7d90feb0f9a 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+Mon Sep 21 22:48:09 1998  Jeffrey A Law  (law@cygnus.com)
+
+	* configure.in: Recognize i[34567]86-*-openbsd* and handle it like
+	NetBSD.
+
 Mon Sep 21 22:05:28 1998  Jeffrey A Law  (law@cygnus.com)
 
 	* Revert this patch.
diff --git a/gcc/configure b/gcc/configure
index ba39987c475..20d567c0e0e 100755
--- a/gcc/configure
+++ b/gcc/configure
@@ -2952,7 +2952,9 @@ for machine in $build $host $target; do
 		fixincludes=fixinc.wrap
 		tmake_file=i386/t-freebsd
 		;;
-	i[34567]86-*-netbsd*)
+	# We are hoping OpenBSD is still close enough to NetBSD that we can
+	# share the configurations.
+	i[34567]86-*-netbsd* | i[34567]86-*-openbsd*)
 		tm_file=i386/netbsd.h
 		# On NetBSD, the headers are already okay, except for math.h.
 		fixincludes=fixinc.wrap
@@ -5472,7 +5474,7 @@ fi
 
 # Figure out what assembler alignment features are present.
 echo $ac_n "checking assembler alignment features""... $ac_c" 1>&6
-echo "configure:5476: checking assembler alignment features" >&5
+echo "configure:5478: checking assembler alignment features" >&5
 gcc_cv_as=
 gcc_cv_as_alignment_features=
 gcc_cv_as_gas_srcdir=`echo $srcdir | sed -e 's,/gcc$,,'`/gas
@@ -5541,7 +5543,7 @@ fi
 echo "$ac_t""$gcc_cv_as_alignment_features" 1>&6
 
 echo $ac_n "checking assembler subsection support""... $ac_c" 1>&6
-echo "configure:5545: checking assembler subsection support" >&5
+echo "configure:5547: checking assembler subsection support" >&5
 gcc_cv_as_subsections=
 if test x$gcc_cv_as != x; then
 	# Check if we have .subsection
@@ -5777,7 +5779,7 @@ fi
 
 # Warn if using init_priority.
 echo $ac_n "checking whether to enable init_priority by default""... $ac_c" 1>&6
-echo "configure:5781: checking whether to enable init_priority by default" >&5
+echo "configure:5783: checking whether to enable init_priority by default" >&5
 if test x$enable_init_priority != xyes; then
   enable_init_priority=no
 fi
diff --git a/gcc/configure.in b/gcc/configure.in
index 27b5a7ce4ca..1833279feb3 100644
--- a/gcc/configure.in
+++ b/gcc/configure.in
@@ -1003,8 +1003,10 @@ changequote([,])dnl
 		fixincludes=fixinc.wrap
 		tmake_file=i386/t-freebsd
 		;;
+	# We are hoping OpenBSD is still close enough to NetBSD that we can
+	# share the configurations.
 changequote(,)dnl
-	i[34567]86-*-netbsd*)
+	i[34567]86-*-netbsd* | i[34567]86-*-openbsd*)
 changequote([,])dnl
 		tm_file=i386/netbsd.h
 		# On NetBSD, the headers are already okay, except for math.h.