diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 9b53161ac4cb..3a35a9a4a3b2 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,5 +1,8 @@
2015-05-29 Jonathan Wakely
+ * doc/xml/manual/status_cxx2017.xml: Fix duplicate ID attribute.
+ * doc/html/manual/*: Regenerate.
+
* include/std/future (__async_result_of): New alias template.
(async): Use __async_result_of to pass decayed types to result_of.
* testsuite/30_threads/async/lwg2021.cc: New.
diff --git a/libstdc++-v3/doc/html/manual/bugs.html b/libstdc++-v3/doc/html/manual/bugs.html
index 16dda6acc153..d42336ca6709 100644
--- a/libstdc++-v3/doc/html/manual/bugs.html
+++ b/libstdc++-v3/doc/html/manual/bugs.html
@@ -348,4 +348,7 @@
1339:
uninitialized_fill_n should return the end of its range
Return the end of the filled range.
+
2021:
+ Further incorrect uses of result_of
+ Correctly decay types in signature of std::async.