diff --git a/gas/ChangeLog b/gas/ChangeLog
index 062daf3996..d60ef5378d 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,9 @@
+2002-05-21  Nick Clifton  <nickc@cambridge.redhat.com>
+
+	* configure.in: Remove accidental enabling of bfd_gas=yes for
+	sh-coff targets.
+	* configure: Regenerate.
+
 2002-05-18  Kazu Hirata  <kazu@cs.umass.edu>
 
 	* app.c: Fix formatting.
diff --git a/gas/configure b/gas/configure
index e7d739987b..73fd356b96 100755
--- a/gas/configure
+++ b/gas/configure
@@ -2578,10 +2578,10 @@ EOF
 			    esac ;;
       sh*-*-netbsdelf*)     fmt=elf em=nbsd ;;
       sh-*-elf*)	    fmt=elf ;;
-      sh-*-coff*)           fmt=coff bfd_gas=yes;;
+      sh-*-coff*)           fmt=coff ;;
       sh-*-pe*)             fmt=coff em=pe bfd_gas=yes endian=little ;;
       sh-*-rtemself*)       fmt=elf ;;
-      sh-*-rtems*)	    fmt=coff bfd_gas=yes;;
+      sh-*-rtems*)	    fmt=coff ;;
 
       sh64-*-elf*)	    fmt=elf ;;
       ns32k-pc532-mach* | ns32k-pc532-ux*)    fmt=aout em=pc532mach ;;
diff --git a/gas/configure.in b/gas/configure.in
index 9655ef2610..c13f82845c 100644
--- a/gas/configure.in
+++ b/gas/configure.in
@@ -423,10 +423,10 @@ changequote([,])dnl
 			    esac ;;
       sh*-*-netbsdelf*)     fmt=elf em=nbsd ;;
       sh-*-elf*)	    fmt=elf ;;
-      sh-*-coff*)           fmt=coff bfd_gas=yes;;
+      sh-*-coff*)           fmt=coff ;;
       sh-*-pe*)             fmt=coff em=pe bfd_gas=yes endian=little ;;
       sh-*-rtemself*)       fmt=elf ;;
-      sh-*-rtems*)	    fmt=coff bfd_gas=yes;;
+      sh-*-rtems*)	    fmt=coff ;;
 
       sh64-*-elf*)	    fmt=elf ;;
       ns32k-pc532-mach* | ns32k-pc532-ux*)    fmt=aout em=pc532mach ;;