diff --git a/ChangeLog b/ChangeLog
index 015c3aa0027..1ee31f28489 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-03-05  David Edelsohn  <edelsohn@gnu.org>
+
+	* ltconfig: Disable building static libraries if building shared
+	libraries on AIX 5L.
+
 2004-03-01  Richard Sandiford  <rsandifo@redhat.com>
 
 	* configure.in (mips64*-*-linux*): Override mips*-*-linux* case
diff --git a/ltconfig b/ltconfig
index 9c420ace726..0d97409d799 100755
--- a/ltconfig
+++ b/ltconfig
@@ -1592,7 +1592,7 @@ aix3*)
   fi
   ;;
 
-aix4*)
+aix4* | aix5*)
   test "$enable_shared" = yes && enable_static=no
   ;;
 esac