diff --git a/ChangeLog b/ChangeLog
index 6e72b6f7abc..6f9c3f7f522 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Apr 23 09:15:03 2001  Anthony Green  <green@redhat.com>
+
+	* configure.in: Move *-chorusos target case to the proper switch.
+	Disable libgcj.
+
 2001-04-12  Alexandre Oliva  <aoliva@redhat.com>
 
 	* ltconfig, ltmain.sh, ltcf-cxx.sh: Upgraded to libtool 1.4a
diff --git a/configure.in b/configure.in
index 4d4e6e1b977..d9f2bb15c4a 100644
--- a/configure.in
+++ b/configure.in
@@ -348,9 +348,6 @@ fi
 # per-target:
 
 case "${target}" in
-  *-*-chorusos)
-    noconfigdirs="$noconfigdirs target-newlib target-libgloss"
-    ;;
   v810*)
     target_makefile_frag="${target_makefile_frag} config/mt-v810"
     ;;
@@ -589,6 +586,9 @@ case "${host}" in
 esac
 
 case "${target}" in
+  *-*-chorusos)
+    noconfigdirs="$noconfigdirs target-newlib target-libgloss ${libgcj}"
+    ;;
   *-*-netware)
     noconfigdirs="$noconfigdirs ${libstdcxx_version} target-librx target-newlib target-libiberty target-libgloss ${libgcj}"
     ;;