diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index f23432a771ed..5ff48044211c 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2007-10-26  Benjamin Kosnik  <bkoz@redhat.com>
+
+	* include/std/unordered_map: Fix for parallel mode.
+	* include/std/unordered_set: Same.	
+
 2007-10-25  Andreas Tobler  <a.tobler@schweiz.org>
 
 	* include/Makefile.am (parallel_headers): Remove timing.h.
diff --git a/libstdc++-v3/include/std/unordered_map b/libstdc++-v3/include/std/unordered_map
index 3e3dcf75eb36..226fea8b1066 100644
--- a/libstdc++-v3/include/std/unordered_map
+++ b/libstdc++-v3/include/std/unordered_map
@@ -58,7 +58,7 @@
 #  include <tr1_impl/unordered_map>
 #else
 #  define _GLIBCXX_INCLUDE_AS_CXX0X
-#if _GLIBCXX_DEBUG
+#if defined(_GLIBCXX_DEBUG) || defined(_GLIBCXX_PARALLEL)
 #  define _GLIBCXX_BEGIN_NAMESPACE_TR1 namespace _GLIBCXX_STD_D {
 #  define _GLIBCXX_END_NAMESPACE_TR1 }
 #  define _GLIBCXX_TR1 _GLIBCXX_STD_D
diff --git a/libstdc++-v3/include/std/unordered_set b/libstdc++-v3/include/std/unordered_set
index daa64cd4a8e3..3b0f22c34189 100644
--- a/libstdc++-v3/include/std/unordered_set
+++ b/libstdc++-v3/include/std/unordered_set
@@ -58,7 +58,7 @@
 #  include <tr1_impl/unordered_set>
 #else
 #  define _GLIBCXX_INCLUDE_AS_CXX0X
-#if _GLIBCXX_DEBUG
+#if defined(_GLIBCXX_DEBUG) || defined(_GLIBCXX_PARALLEL)
 #  define _GLIBCXX_BEGIN_NAMESPACE_TR1 namespace _GLIBCXX_STD_D {
 #  define _GLIBCXX_END_NAMESPACE_TR1 }
 #  define _GLIBCXX_TR1 _GLIBCXX_STD_D