diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index caad393416e..7657d1489ca 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,5 +1,10 @@
 2017-04-03  Jonathan Wakely  <jwakely@redhat.com>
 
+	* doc/xml/manual/status_cxx2017.xml: Update C++17 status table.
+	* doc/xml/manual/appendix_contributing.xml (contrib.organization): Add
+	directories for debug, parallel and profile headers.
+	* doc/html/*: Regenerate.
+
 	* include/bits/char_traits.h (__gnu_cxx::char_traits): Add
 	_GLIBCXX14_CONSTEXPR on assign, compare, find, and length.
 	(std::char_traits<char>, std::char_traits<wchar_t>): Add
diff --git a/libstdc++-v3/doc/html/manual/source_organization.html b/libstdc++-v3/doc/html/manual/source_organization.html
index a956b507b9b..7ec9cadf19c 100644
--- a/libstdc++-v3/doc/html/manual/source_organization.html
+++ b/libstdc++-v3/doc/html/manual/source_organization.html
@@ -42,7 +42,14 @@ It has subdirectories:
       Headers that define extensions to the standard library.  No
       standard header refers to any of them, in theory (there are some
       exceptions).
-      </dd></dl></div></dd><dt><span class="term"><code class="filename">scripts</code></span></dt><dd>
+    </dd><dt><span class="term">
+      <code class="filename">include/debug</code>,
+      <code class="filename">include/parallel</code>, and
+      <code class="filename">include/profile</code>
+    </span></dt><dd>
+      Headers that implement the Debug Mode, Parallel Mode, and Profile Mode
+      extensions.
+    </dd></dl></div></dd><dt><span class="term"><code class="filename">scripts</code></span></dt><dd>
     Scripts that are used during the configure, build, make, or test
     process.
     </dd><dt><span class="term"><code class="filename">src</code></span></dt><dd>
diff --git a/libstdc++-v3/doc/html/manual/status.html b/libstdc++-v3/doc/html/manual/status.html
index 7b6c58446da..8a343f20f34 100644
--- a/libstdc++-v3/doc/html/manual/status.html
+++ b/libstdc++-v3/doc/html/manual/status.html
@@ -680,7 +680,15 @@ Feature-testing recommendations for C++</a>.
 	<a class="link" href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2015/p0092r1.html" target="_top">
 	P0092R1
 	</a>
-      </td><td align="center"> 7 </td><td align="left"><code class="code"> __cpp_lib_chrono &gt;= 201510 </code></td></tr><tr><td align="left"> Integrating <code class="code">std::string_view</code> and <code class="code">std::string</code> </td><td align="left">
+      </td><td align="center"> 7 </td><td align="left"><code class="code"> __cpp_lib_chrono &gt;= 201510 </code></td></tr><tr><td align="left"> Adding more constexpr to <code class="code">&lt;chrono&gt;</code> </td><td align="left">
+	<a class="link" href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2016/p0505r0.html" target="_top">
+	P0505R0
+	</a>
+      </td><td align="center"> 7 </td><td align="left"><code class="code"> ??? </code></td></tr><tr bgcolor="#B0B0B0"><td align="left"> Constexpr for <code class="code">std::char_traits</code> </td><td align="left">
+	<a class="link" href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2016/p0426r1.html" target="_top">
+	P0426R1
+	</a>
+      </td><td align="center"> 7 (partial) </td><td align="left"><code class="code"> ??? </code></td></tr><tr><td align="left"> Integrating <code class="code">std::string_view</code> and <code class="code">std::string</code> </td><td align="left">
 	<a class="link" href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2016/p0254r2.pdf" target="_top">
 	P0254R2
 	</a>
@@ -712,7 +720,11 @@ Feature-testing recommendations for C++</a>.
 	</a>
       </td><td align="center"> 6.1 </td><td align="left"><code class="code"> __cpp_lib_map_try_emplace &gt;= 201411</code>,
 	     <code class="code"> __cpp_lib_unordered_map_try_emplace &gt;= 201411</code>
-      </td></tr><tr><td align="left"> Splicing Maps and Sets </td><td align="left">
+      </td></tr><tr><td align="left"> Return type of <code class="code">emplace</code> </td><td align="left">
+	<a class="link" href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2016/p0084r2.pdf" target="_top">
+	P0084R2
+	</a>
+      </td><td align="center"> 7 </td><td align="left"><code class="code"> ??? </code></td></tr><tr><td align="left"> Splicing Maps and Sets </td><td align="left">
 	<a class="link" href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2016/p0083r3.pdf" target="_top">
 	P0083R3
 	</a>
@@ -776,11 +788,15 @@ Feature-testing recommendations for C++</a>.
 	<a class="link" href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2017/p0156r2.html" target="_top">
 	P0156R2
 	</a>
-      </td><td align="center"> 7 </td><td align="left"><code class="code"> __cpp_lib_scoped_lock &gt;= 201703 </code></td></tr><tr bgcolor="#C8B0B0"><td align="left">  </td><td align="left">
+      </td><td align="center"> 7 </td><td align="left"><code class="code"> __cpp_lib_scoped_lock &gt;= 201703 </code></td></tr><tr><td align="left"> byte type definition </td><td align="left">
 	<a class="link" href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2017/p0298r3.pdf" target="_top">
 	P0298R3
 	</a>
-      </td><td align="center"> 7 </td><td align="left"><code class="code"> ??? </code></td></tr></tbody></table></div></div><br class="table-break" /><div class="table"><a id="table.cxx1z_ts_status"></a><p class="title"><strong>Table 1.6. C++ Technical Specifications Implementation Status</strong></p><div class="table-contents"><table summary="C++ Technical Specifications Implementation Status" border="1"><colgroup><col align="left" class="c1" /><col align="left" class="c2" /><col align="left" class="c3" /><col align="left" class="c4" /></colgroup><thead><tr><th align="left">Paper</th><th align="left">Title</th><th align="left">Status</th><th align="left">Comments</th></tr></thead><tbody><tr><td align="left">
+      </td><td align="center"> 7 </td><td align="left"><code class="code"> ??? </code></td></tr><tr bgcolor="#C8B0B0"><td align="left"> Elementary string conversions </td><td align="left">
+	<a class="link" href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2016/p0067r5.html" target="_top">
+	P0067R5
+	</a>
+      </td><td align="center"> No </td><td align="left"><code class="code"> ??? </code></td></tr></tbody></table></div></div><br class="table-break" /><div class="table"><a id="table.cxx1z_ts_status"></a><p class="title"><strong>Table 1.6. C++ Technical Specifications Implementation Status</strong></p><div class="table-contents"><table summary="C++ Technical Specifications Implementation Status" border="1"><colgroup><col align="left" class="c1" /><col align="left" class="c2" /><col align="left" class="c3" /><col align="left" class="c4" /></colgroup><thead><tr><th align="left">Paper</th><th align="left">Title</th><th align="left">Status</th><th align="left">Comments</th></tr></thead><tbody><tr><td align="left">
 	<a class="link" href="http://www.open-std.org/JTC1/SC22/WG21/docs/papers/2014/n4076.html" target="_top">
 	  N4076
 	</a>
diff --git a/libstdc++-v3/doc/xml/manual/appendix_contributing.xml b/libstdc++-v3/doc/xml/manual/appendix_contributing.xml
index e967f61f001..dbc671e698e 100644
--- a/libstdc++-v3/doc/xml/manual/appendix_contributing.xml
+++ b/libstdc++-v3/doc/xml/manual/appendix_contributing.xml
@@ -285,7 +285,19 @@ It has subdirectories:
       Headers that define extensions to the standard library.  No
       standard header refers to any of them, in theory (there are some
       exceptions).
-      </listitem>
+    </listitem>
+    </varlistentry>
+
+    <varlistentry>
+    <term>
+      <filename class="directory">include/debug</filename>,
+      <filename class="directory">include/parallel</filename>, and
+      <filename class="directory">include/profile</filename>
+    </term>
+    <listitem>
+      Headers that implement the Debug Mode, Parallel Mode, and Profile Mode
+      extensions.
+    </listitem>
     </varlistentry>
     </variablelist>
   </listitem>
diff --git a/libstdc++-v3/doc/xml/manual/status_cxx2017.xml b/libstdc++-v3/doc/xml/manual/status_cxx2017.xml
index e0e4e8e7c80..7a158b9bb20 100644
--- a/libstdc++-v3/doc/xml/manual/status_cxx2017.xml
+++ b/libstdc++-v3/doc/xml/manual/status_cxx2017.xml
@@ -470,6 +470,29 @@ Feature-testing recommendations for C++</link>.
       <entry><code> __cpp_lib_chrono >= 201510 </code></entry>
     </row>
 
+    <row>
+      <entry> Adding more constexpr to <code>&lt;chrono&gt;</code> </entry>
+      <entry>
+	<link xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2016/p0505r0.html">
+	P0505R0
+	</link>
+      </entry>
+      <entry align="center"> 7 </entry>
+      <entry><code> ??? </code></entry>
+    </row>
+
+    <row>
+      <?dbhtml bgcolor="#B0B0B0" ?>
+      <entry> Constexpr for <code>std::char_traits</code> </entry>
+      <entry>
+	<link xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2016/p0426r1.html">
+	P0426R1
+	</link>
+      </entry>
+      <entry align="center"> 7 (partial) </entry>
+      <entry><code> ??? </code></entry>
+    </row>
+
     <row>
       <entry> Integrating <code>std::string_view</code> and <code>std::string</code> </entry>
       <entry>
@@ -551,6 +574,17 @@ Feature-testing recommendations for C++</link>.
       </entry>
     </row>
 
+    <row>
+      <entry> Return type of <code>emplace</code> </entry>
+      <entry>
+	<link xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2016/p0084r2.pdf">
+	P0084R2
+	</link>
+      </entry>
+      <entry align="center"> 7 </entry>
+      <entry><code> ??? </code></entry>
+    </row>
+
     <row>
       <entry> Splicing Maps and Sets </entry>
       <entry>
@@ -718,8 +752,7 @@ Feature-testing recommendations for C++</link>.
     </row>
 
     <row>
-      <?dbhtml bgcolor="#C8B0B0" ?>
-      <entry>  </entry> byte type definition
+      <entry> byte type definition </entry>
       <entry>
 	<link xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2017/p0298r3.pdf">
 	P0298R3
@@ -729,6 +762,18 @@ Feature-testing recommendations for C++</link>.
       <entry><code> ??? </code></entry>
     </row>
 
+    <row>
+      <?dbhtml bgcolor="#C8B0B0" ?>
+      <entry> Elementary string conversions </entry>
+      <entry>
+	<link xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2016/p0067r5.html">
+	P0067R5
+	</link>
+      </entry>
+      <entry align="center"> No </entry>
+      <entry><code> ??? </code></entry>
+    </row>
+
 
   </tbody>
 </tgroup>