diff --git a/ChangeLog b/ChangeLog
index e4a4f10706..0937c321f9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Thu Apr 25 11:48:20 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* configure.in: Don't configure --with-gnu-ld on AIX.
+
 Thu Apr 25 06:33:36 1996  Michael Meissner  <meissner@wogglebug.tiac.net>
 
 	* configure.in (powerpcle-*-solaris*): Turn off gdb temporarily.
diff --git a/configure.in b/configure.in
index 8b863c3e80..4b000ee2e0 100644
--- a/configure.in
+++ b/configure.in
@@ -458,6 +458,8 @@ case "${target}" in
   powerpc-*-aix*)
     # copied from rs6000-*-* entry
     noconfigdirs="$noconfigdirs gprof cvs target-libgloss"
+    # This is needed until gcc and ld are fixed to work together.
+    use_gnu_ld=no
     ;;
   powerpc*-*-winnt* | powerpc*-*-pe* | ppc*-*-pe)
     target_configdirs="$target_configdirs target-winsup"
@@ -474,6 +476,11 @@ case "${target}" in
     # Newlib makes problems for libg++ in crosses.
     noconfigdirs="$noconfigdirs target-newlib gprof cvs"
     ;;
+  rs6000-*-aix*)
+    noconfigdirs="$noconfigdirs gprof"
+    # This is needed until gcc and ld are fixed to work together.
+    use_gnu_ld=no
+    ;;
   rs6000-*-*)
     noconfigdirs="$noconfigdirs gprof"
     ;;