diff --git a/ChangeLog b/ChangeLog
index f924975af14..430c51d2fce 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Tue Oct 11 12:12:29 1994  Jason Merrill  (jason@phydeaux.cygnus.com)
+
+	* Makefile.in (CXXFLAGS): Use -fno-implicit-templates instead of
+	-fexternal-templates.
+
+	* configure.in (target_libs): Add libstdc++.
+	(noconfigdirs): Add libstdc++ as appropriate.
+
 Thu Oct  6 18:00:54 1994  Per Bothner  (bothner@kalessin.cygnus.com)
 
 	* config.guess:  Update from FSF.
diff --git a/Makefile.in b/Makefile.in
index a9ad9a9e049..52fa8e2acb1 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -74,7 +74,7 @@ CHILL_LIB = -lchill
 CXX = gcc
 
 # Use -O2 to stress test the compiler.
-CXXFLAGS = -g -O2 -fexternal-templates
+CXXFLAGS = -g -O2 -fno-implicit-templates
 
 RANLIB = ranlib
 NM = nm
@@ -926,7 +926,7 @@ all-mmalloc:
 all-newlib: all-binutils all-gas all-pagas all-gcc
 all-opcodes: all-bfd
 all-patch:
-all-prms: all-libiberty all-librx
+all-prms: all-libiberty
 all-rcs:
 all-readline:
 all-recode: all-libiberty