diff --git a/ChangeLog b/ChangeLog
index 18b479b9f..6c864d362 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,13 +1,22 @@
+2002-06-24  Ben Elliston  <bje@redhat.com>
+
+	* configure.in (host_tools): Remove cgen.
+
+	* Makefile.in (all-cgen): Remove; runs from its source directory.
+	(check-cgen, install-cgen, clean-cgen): Likewise.
+	(all-opcodes): No not depend on all-cgen.
+	(all-sim): Likewise.
+
 2002-06-22  Nathanael Nerode  <neroden@twcny.rr.com>
 
 	* configure.in: Fix AIX configury bug.
 
 2002-06-19  Nathanael Nerode  <neroden@twcny.rr.com>
 
-	* configure.in: replace ${topsrcdir} with ${srcdir}
+	* configure.in: Replace ${topsrcdir} with ${srcdir}.
 
-	* configure.in: Move definition of libstdcxx_flags
-	right above usage, rather than waaay earlier.
+	* configure.in: Move definition of libstdcxx_flags right above
+	usage, rather than way earlier.
 
 	* configure.in: Pull definition of is_cross_compiler earlier.
 
diff --git a/Makefile.in b/Makefile.in
index 6aa538355..f39eaf27f 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -535,7 +535,6 @@ ALL_MODULES = \
 	all-bison \
 	all-byacc \
 	all-bzip2 \
-	all-cgen \
 	all-cvssrc \
 	all-db \
 	all-dejagnu \
@@ -616,7 +615,6 @@ CROSS_CHECK_MODULES = \
 	check-bfd \
 	check-binutils \
 	check-bzip2 \
-	check-cgen \
 	check-cvssrc \
 	check-db \
 	check-dejagnu \
@@ -689,7 +687,6 @@ INSTALL_MODULES = \
 	install-binutils \
 	install-bison \
 	install-byacc \
-	install-cgen \
 	install-cvssrc \
 	install-db \
 	install-dejagnu \
@@ -869,7 +866,6 @@ CLEAN_MODULES = \
 	clean-bison \
 	clean-byacc \
 	clean-bzip2 \
-	clean-cgen \
 	clean-cvssrc \
 	clean-db \
 	clean-dejagnu \
@@ -1714,7 +1710,6 @@ configure-target-bsp: $(ALL_GCC_C)
 all-target-bsp: configure-target-bsp
 all-byacc:
 all-bzip2:
-all-cgen: all-libiberty
 all-cvssrc:
 configure-target-cygmon: $(ALL_GCC_C)
 all-target-cygmon: configure-target-cygmon all-target-libiberty all-target-libstub all-target-bsp
@@ -1781,7 +1776,7 @@ configure-target-newlib: $(ALL_GCC)
 all-target-newlib: configure-target-newlib
 configure-target-libtermcap: $(ALL_GCC_C)
 all-target-libtermcap: configure-target-libtermcap
-all-opcodes: all-bfd all-libiberty all-cgen
+all-opcodes: all-bfd all-libiberty
 all-patch: all-libiberty
 all-perl:
 all-prms: all-libiberty
@@ -1794,7 +1789,7 @@ all-sed: all-libiberty
 all-send-pr: all-prms
 all-shellutils:
 all-sid: all-tcl all-tk
-all-sim: all-libiberty all-bfd all-opcodes all-readline all-cgen
+all-sim: all-libiberty all-bfd all-opcodes all-readline
 all-snavigator: all-tcl all-tk all-itcl all-tix all-db all-grep all-libgui
 all-tar: all-libiberty
 all-tcl:
diff --git a/configure.in b/configure.in
index ad0f0710b..36d05c159 100644
--- a/configure.in
+++ b/configure.in
@@ -49,7 +49,7 @@ libstdcxx_version="target-libstdc++-v3"
 # these tools are built for the host environment
 # Note, the powerpc-eabi build depends on sim occurring before gdb in order to
 # know that we are building the simulator.
-host_tools="texinfo byacc flex bison binutils ld gas gcc cgen sid sim gdb make patch prms send-pr gprof gdbtest tgas etc expect dejagnu ash bash bzip2 m4 autoconf automake libtool ispell grep diff rcs cvssrc fileutils shellutils time textutils wdiff find uudecode hello tar gzip indent recode release sed utils guile perl apache inet gawk findutils snavigator libtool gettext zip fastjar"
+host_tools="texinfo byacc flex bison binutils ld gas gcc sid sim gdb make patch prms send-pr gprof gdbtest tgas etc expect dejagnu ash bash bzip2 m4 autoconf automake libtool ispell grep diff rcs cvssrc fileutils shellutils time textutils wdiff find uudecode hello tar gzip indent recode release sed utils guile perl apache inet gawk findutils snavigator libtool gettext zip fastjar"
 
 # libgcj represents the runtime libraries only used by gcj.
 libgcj="target-libffi \