diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index b7e3a433ecc..3da113050e0 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,9 @@
+2007-07-10  Bob Wilson  <bob.wilson@acm.org>
+	
+	* configure.ac: Check if $atomicity_dir is cpu/generic/atomicity_mutex
+	instead of the non-existent cpu/generic/atomic_mutex.
+	* configure: Regenerate.
+	
 2007-07-10  Paolo Carlini  <pcarlini@suse.de>
 
 	* include/std/utility (identity, move, forward): Add.
diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure
index 56368b1e5fc..8e78be89292 100755
--- a/libstdc++-v3/configure
+++ b/libstdc++-v3/configure
@@ -16621,7 +16621,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
  echo "$as_me:$LINENO: result: $enable_atomic_builtins" >&5
 echo "${ECHO_T}$enable_atomic_builtins" >&6
 
-if test $atomicity_dir = cpu/generic/atomic_mutex ; then
+if test $atomicity_dir = cpu/generic/atomicity_mutex ; then
   { echo "$as_me:$LINENO: WARNING: No native atomic operations are provided for this platform." >&5
 echo "$as_me: WARNING: No native atomic operations are provided for this platform." >&2;}
   if test $target_thread_file = single; then
diff --git a/libstdc++-v3/configure.ac b/libstdc++-v3/configure.ac
index bbef6c16f06..5d1d947a881 100644
--- a/libstdc++-v3/configure.ac
+++ b/libstdc++-v3/configure.ac
@@ -113,7 +113,7 @@ GLIBCXX_ENABLE_FULLY_DYNAMIC_STRING([no])
 # No surprises, no surprises...
 GLIBCXX_ENABLE_THREADS
 GLIBCXX_ENABLE_ATOMIC_BUILTINS
-if test $atomicity_dir = cpu/generic/atomic_mutex ; then
+if test $atomicity_dir = cpu/generic/atomicity_mutex ; then
   AC_MSG_WARN([No native atomic operations are provided for this platform.])
   if test $target_thread_file = single; then
     AC_MSG_WARN([They cannot be faked when thread support is disabled.])