diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index be527fa5162..35dcde6d261 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2003-10-19  David Edelsohn  <edelsohn@gnu.org>
+
+	PR other/12506
+	* configure.host (aix4,aix*): Define os_include_dir to os/generic.
+
 2003-10-18  Andreas Tobler  <a.tobler@schweiz.ch>
 
 	* src/locale.cc (locale::_S_initialize): Re-apply workaround a
diff --git a/libstdc++-v3/configure.host b/libstdc++-v3/configure.host
index 3b800238824..6f2c54e1554 100644
--- a/libstdc++-v3/configure.host
+++ b/libstdc++-v3/configure.host
@@ -126,9 +126,11 @@ case "${host_os}" in
     OPT_LDFLAGS="-Wl,-G"
     ;;
   aix4.*)
+    os_include_dir="os/generic"
     atomicity_include_dir="os/aix"
     ;;
   aix*)
+    os_include_dir="os/generic"
     atomicity_include_dir="cpu/generic"
     ;;
   bsd*)