diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 7b66e6a178de..ca01b90bd871 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2011-12-05  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	* libsupc++/initializer_list: Do not declare anything if
+	__GXX_EXPERIMENTAL_CXX0X__ is not defined.
+
 2011-12-04  Jonathan Wakely  <jwakely.gcc@gmail.com>
 
 	* include/std/type_traits: Doxygen improvements.
diff --git a/libstdc++-v3/libsupc++/initializer_list b/libstdc++-v3/libsupc++/initializer_list
index 0e2c58a43ae4..6b991b7d6630 100644
--- a/libstdc++-v3/libsupc++/initializer_list
+++ b/libstdc++-v3/libsupc++/initializer_list
@@ -34,7 +34,7 @@
 
 #ifndef __GXX_EXPERIMENTAL_CXX0X__
 # include <bits/c++0x_warning.h>
-#endif // C++0x
+#else // C++0x
 
 #pragma GCC visibility push(default)
 
@@ -101,4 +101,7 @@ namespace std
 }
 
 #pragma GCC visibility pop
+
+#endif // __GXX_EXPERIMENTAL_CXX0X__
+
 #endif // _INITIALIZER_LIST