diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 1f6d2e46938f864b3e3a6c32295f39a160382c99..dc98cf7467be8582c6b1b06535f719dd9d1b7699 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,7 @@
+2011-02-10  Jonathan Wakely  <jwakely.gcc@gmail.com>
+
+	* src/future.cc (future_error_category::message): Handle no_state.
+
 2011-02-10  Paolo Carlini  <paolo.carlini@oracle.com>
 
 	* testsuite/23_containers/multimap/modifiers/erase/47628.cc: Do
diff --git a/libstdc++-v3/src/future.cc b/libstdc++-v3/src/future.cc
index cbce2b1a757f0650e181e4525d5c5decada9e250..d5afcf21c8c83a09722cfb14b0881ecd6d7acbf5 100644
--- a/libstdc++-v3/src/future.cc
+++ b/libstdc++-v3/src/future.cc
@@ -1,6 +1,6 @@
 // future -*- C++ -*-
 
-// Copyright (C) 2009, 2010 Free Software Foundation, Inc.
+// Copyright (C) 2009, 2010, 2011 Free Software Foundation, Inc.
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
 // software; you can redistribute it and/or modify it under the
@@ -48,6 +48,9 @@ namespace
       case std::future_errc::promise_already_satisfied:
           __msg = "Promise already satisfied";
           break;
+      case std::future_errc::no_state:
+          __msg = "No associated state";
+          break;
       default:
           __msg = "Unknown error";
           break;