diff --git a/ChangeLog b/ChangeLog
index b2f7362e5..d90e6cab6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2002-06-19  Nathanael Nerode  <neroden@twcny.rr.com>
 
+	* configure.in: Rearrange a little.
+
 	* configure.in: Remove references to librx.
 	* Makefile.in: Remove references to librx.
 
diff --git a/configure.in b/configure.in
index f606bed50..33d1a9c89 100644
--- a/configure.in
+++ b/configure.in
@@ -45,8 +45,6 @@
 host_libs="intl mmalloc libiberty opcodes bfd readline db tcl tk tclX itcl tix libgui zlib"
 
 libstdcxx_version="target-libstdc++-v3"
-# Don't use libstdc++-v3's flags to configure/build itself.
-libstdcxx_flags='`case $$dir in libstdc++-v3 | libjava) ;; *) test ! -f $$r/$(TARGET_SUBDIR)/libstdc++-v3/testsuite_flags || $(SHELL) $$r/$(TARGET_SUBDIR)/libstdc++-v3/testsuite_flags --build-includes;; esac` -L$$r/$(TARGET_SUBDIR)/libstdc++-v3/src -L$$r/$(TARGET_SUBDIR)/libstdc++-v3/src/.libs'
 
 # these tools are built for the host environment
 # Note, the powerpc-eabi build depends on sim occurring before gdb in order to
@@ -117,6 +115,13 @@ appdirs=""
 
 # per-host:
 
+# There is no longer anything interesting in the per-host section.
+
+# per-target:
+
+# Don't use libstdc++-v3's flags to configure/build itself.
+libstdcxx_flags='`case $$dir in libstdc++-v3 | libjava) ;; *) test ! -f $$r/$(TARGET_SUBDIR)/libstdc++-v3/testsuite_flags || $(SHELL) $$r/$(TARGET_SUBDIR)/libstdc++-v3/testsuite_flags --build-includes;; esac` -L$$r/$(TARGET_SUBDIR)/libstdc++-v3/src -L$$r/$(TARGET_SUBDIR)/libstdc++-v3/src/.libs'
+
 # Work in distributions that contain no compiler tools, like Autoconf.
 tentative_cc=""
 if test -d ${srcdir}/config ; then
@@ -350,8 +355,6 @@ if test -n "${host_makefile_frag}" ; then
   host_makefile_frag=mh-frag
 fi
 
-# per-target:
-
 case "${target}" in
   v810*)
     target_makefile_frag="${target_makefile_frag} config/mt-v810"