diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 391e5d9010c..d93b7e61a2c 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2012-11-12  Jonathan Wakely  <jwakely.gcc@gmail.com>
+
+	* include/std/future (atomic_future): Remove declaration of
+	non-standard name.
+
 2012-11-11  Jason Merrill  <jason@redhat.com>
 
 	* include/std/complex (real, imag): Add ABI tag in C++11 mode.
diff --git a/libstdc++-v3/include/std/future b/libstdc++-v3/include/std/future
index 7f71dde5d55..dd1a86b4d7b 100644
--- a/libstdc++-v3/include/std/future
+++ b/libstdc++-v3/include/std/future
@@ -115,9 +115,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
   template<typename _Res>
     class shared_future;
 
-  template<typename _Res>
-    class atomic_future;
-
   template<typename _Signature>
     class packaged_task;