diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 53b5adbf18d..12cd266f2dd 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2001-05-17  Alexandre Oliva  <aoliva@redhat.com>
+
+	* configure.target (ATOMICITYH): Don't use AIX 4.3-specific code
+	on earlier versions of AIX.
+
 2001-05-15  Benjamin Kosnik  <bkoz@redhat.com>
 
 	* testsuite_flags.in (query): Add backwards, ext directories.
diff --git a/libstdc++-v3/configure.target b/libstdc++-v3/configure.target
index 4614680801a..18563634930 100644
--- a/libstdc++-v3/configure.target
+++ b/libstdc++-v3/configure.target
@@ -105,7 +105,7 @@ esac
 # THIS TABLE IS SORTED.  KEEP IT THAT WAY.
 
 case "${target}" in
-   *-*-aix*)
+   *-*-aix4.[3456789]* | *-*-aix[56789]*)
      ATOMICITYH=$os_include_dir
      ;;
    *-*-irix*)