diff --git a/ChangeLog b/ChangeLog
index ca34bcb115fa5eb8db0af4a6c26c3be8d8b6b376..ef5e5e084cf36006cff9f8d1044e4d1a332369f8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2001-01-25  David Edelsohn  <edelsohn@gnu.org>
+
+	* ltcf-c.sh: Add aix5 case.
+	* ltcf-cxx.sh: Likewise.
+	* ltconfig: Likewise.
+
 2001-01-24  Alexandre Oliva  <aoliva@redhat.com>
 
 	* ltmain.sh (TAG disable-shared, TAG disable-static): Make sure we
diff --git a/ltcf-c.sh b/ltcf-c.sh
index 4ce77fc472a276b2e4f70938f0b7b5e78d083c7a..f00055f2ce82c4a57aec85fe2541c680a66ad952 100644
--- a/ltcf-c.sh
+++ b/ltcf-c.sh
@@ -57,7 +57,7 @@ if test "$with_gnu_ld" = yes; then
 
   # See if GNU ld supports shared libraries.
   case "$host_os" in
-  aix3* | aix4*)
+  aix3* | aix4* | aix5*)
     # On AIX, the GNU linker is very broken
     ld_shlibs=no
     cat <<EOF 1>&2
@@ -251,7 +251,7 @@ else
     fi
     ;;
 
-  aix4*)
+  aix4* | aix5*)
     hardcode_libdir_flag_spec='${wl}-b ${wl}nolibpath ${wl}-b ${wl}libpath:$libdir:/usr/lib:/lib'
     hardcode_libdir_separator=':'
     if test "$with_gcc" = yes; then
@@ -575,7 +575,7 @@ else
   else
     # PORTME Check for PIC flags for the system compiler.
     case "$host_os" in
-    aix3* | aix4*)
+    aix3* | aix4* | aix5*)
      # All AIX code is PIC.
       ac_cv_prog_cc_static='-bnso -bI:/lib/syscalls.exp'
       ;;
diff --git a/ltcf-cxx.sh b/ltcf-cxx.sh
index 9c7782f2791a91c0d76ca04d9a85413d9eb25938..4b8913b14e5e2fd621c146b4d7df5309dee0dda3 100644
--- a/ltcf-cxx.sh
+++ b/ltcf-cxx.sh
@@ -116,7 +116,7 @@ fi
 
 # In general, the C++ compiler should always link C++ objects.
 case $target in
-*aix3* | *aix4*)
+*aix3* | *aix4* | *aix5*)
   # AIX just has to be different, doesn't it? :-\
   LD=makeC++SharedLib_r
   LDFLAGS="$LDFLAGS -p 0"
@@ -134,7 +134,7 @@ case "$host_os" in
     # FIXME: insert proper C++ library support
     ld_shlibs=no
     ;;
-  aix4*)
+  aix4* | aix5*)
     archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
     # -bexpall does not export symbols beginning with underscore (_)
     always_export_symbols=yes
@@ -621,7 +621,7 @@ if test "$with_gcc" = yes; then
   esac
 else
   case "$host_os" in
-    aix4*)
+    aix4* | aix5*)
       # All AIX code is PIC.
       ;;
     chorus*)
diff --git a/ltconfig b/ltconfig
index 2f54843f54dd8eca3b4d04a4699de8822ae91fd2..168923f5ddf2e96bdf7f39e34a932520ae8132ae 100755
--- a/ltconfig
+++ b/ltconfig
@@ -942,7 +942,7 @@ aix3*)
   soname_spec='${libname}${release}.so$major'
   ;;
 
-aix4*)
+aix4* | aix5*)
   version_type=linux
   # AIX has no versioning support, so currently we can not hardcode correct
   # soname into executable. Probably we can add versioning support to
@@ -1432,7 +1432,7 @@ aix3*)
   fi
   ;;
 
-aix4*)
+aix4* | aix5*)
   test "$enable_shared" = yes && enable_static=no
   ;;
 esac