diff --git a/ChangeLog b/ChangeLog
index 9653c721ef2..4a18683f1c5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Tue May  6 15:49:52 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* configure: Default CXX to c++, not gcc.
+	* Makefile.in (CXX): Set to c++, not gcc.
+	(CXX_FOR_TARGET): When cross, transform c++, not gcc.
+
 start-sanitize-ide
 Tue May  6 11:23:57 1997  Ian Lance Taylor  <ian@cygnus.com>
 
diff --git a/Makefile.in b/Makefile.in
index 1890882a6b9..6479b87700b 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -76,7 +76,7 @@ PICFLAG_FOR_TARGET =
 CHILLFLAGS = $(CFLAGS)
 CHILL_LIB = -lchill
 # end-sanitize-chill
-CXX = gcc
+CXX = c++
 
 # Use -O2 to stress test the compiler.
 CXXFLAGS = -g -O2
@@ -223,7 +223,7 @@ CXX_FOR_TARGET = ` \
     if [ "$(host_canonical)" = "$(target_canonical)" ] ; then \
       echo $(CXX); \
     else \
-      t='$(program_transform_name)'; echo gcc | sed -e 's/x/x/' $$t; \
+      t='$(program_transform_name)'; echo c++ | sed -e 's/x/x/' $$t; \
     fi; \
   fi`