Index: stable/10/release/doc/share/xml/errata.xml
===================================================================
--- stable/10/release/doc/share/xml/errata.xml	(revision 333375)
+++ stable/10/release/doc/share/xml/errata.xml	(revision 333376)
@@ -1,61 +1,77 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
 
      $FreeBSD$
 -->
 <informaltable frame="none" pgwide="1">
   <tgroup cols="3">
     <colspec colwidth="40%"/>
     <colspec colwidth="30%"/>
     <colspec colwidth="30%"/>
     <thead>
       <row>
 	<entry>Errata</entry>
 	<entry>Date</entry>
 	<entry>Topic</entry>
       </row>
     </thead>
 
     <tbody>
       <row>
 	<entry><link
 	    xlink:href="&security.url;/FreeBSD-EN-17:09.tzdata.asc">FreeBSD-EN-17:09.tzdata</link></entry>
 	<entry>2&nbsp;November&nbsp;2017</entry>
 	<entry><para>Timezone database information
 	    update</para></entry>
       </row>
 
       <row>
 	<entry><link
 	    xlink:href="&security.url;/FreeBSD-EN-18:01.tzdata.asc">FreeBSD-EN-18:01.tzdata</link></entry>
 	<entry>07&nbsp;March&nbsp;2018</entry>
 	<entry><para>Timezone database information
 	    update</para></entry>
       </row>
 
       <row>
 	<entry><link
 	    xlink:href="&security.url;/FreeBSD-EN-18:02.file.asc">FreeBSD-EN-18:02.file</link></entry>
 	<entry>07&nbsp;March&nbsp;2018</entry>
 	<entry><para>Stack-based buffer overflow</para></entry>
       </row>
 
       <row>
 	<entry><link
 	    xlink:href="&security.url;/FreeBSD-EN-18:03.tzdata.asc">FreeBSD-EN-18:03.tzdata</link></entry>
 	<entry>04&nbsp;April&nbsp;2018</entry>
 	<entry><para>Update timezone database
 	    information</para></entry>
       </row>
 
       <row>
 	<entry><link
 	    xlink:href="&security.url;/FreeBSD-EN-18:04.mem.asc">FreeBSD-EN-18:04.mem</link></entry>
 	<entry>04&nbsp;April&nbsp;2018</entry>
 	<entry><para>Multiple small kernel memory
 	    disclosures</para></entry>
       </row>
+
+      <row>
+	<entry><link
+	    xlink:href="&security.url;/FreeBSD-EN-18:05.mem.asc">FreeBSD-EN-18:05.mem</link></entry>
+	<entry>08&nbsp;May&nbsp;2018</entry>
+	<entry><para>Multiple small kernel memory
+	    disclosures</para></entry>
+      </row>
+
+      <row>
+	<entry><link
+	    xlink:href="&security.url;/FreeBSD-EN-18:06.tzdata.asc">FreeBSD-EN-18:06.tzdata</link></entry>
+	<entry>08&nbsp;May&nbsp;2018</entry>
+	<entry><para>Update timezone database
+	    information</para></entry>
+      </row>
     </tbody>
   </tgroup>
 </informaltable>
Index: stable/10/release/doc/share/xml/security.xml
===================================================================
--- stable/10/release/doc/share/xml/security.xml	(revision 333375)
+++ stable/10/release/doc/share/xml/security.xml	(revision 333376)
@@ -1,103 +1,111 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
 
      $FreeBSD$
 -->
 <informaltable frame="none" pgwide="1">
   <tgroup cols="3">
     <colspec colwidth="40%"/>
     <colspec colwidth="30%"/>
     <colspec colwidth="30%"/>
     <thead>
       <row>
 	<entry>Advisory</entry>
 	<entry>Date</entry>
 	<entry>Topic</entry>
       </row>
     </thead>
 
     <tbody>
       <row>
 	<entry><link
 	    xlink:href="&security.url;/FreeBSD-SA-17:06.openssh.asc">FreeBSD-SA-17:06.openssh</link></entry>
 	<entry>10&nbsp;August&nbsp;2017</entry>
 	<entry><para>Denial of Service vulnerability</para></entry>
       </row>
 
       <row>
 	<entry><link
 	    xlink:href="&security.url;/FreeBSD-SA-17:07.wpa.asc">FreeBSD-SA-17:07.wpa</link></entry>
 	<entry>16&nbsp;October&nbsp;2017</entry>
 	<entry><para>WPA2 protocol vulnerability</para></entry>
       </row>
 
       <row>
 	<entry><link
 	    xlink:href="&security.url;/FreeBSD-SA-17:08.ptrace.asc">FreeBSD-SA-17:08.ptrace</link></entry>
 	<entry>15&nbsp;November&nbsp;2017</entry>
 	<entry><para>Kernel data leak via
 	    <function>ptrace(PT_LWPINFO)</function></para></entry>
       </row>
 
       <row>
 	<entry><link
 	    xlink:href="&security.url;/FreeBSD-SA-17:09.sch.asc">FreeBSD-SA-17:09.shm</link></entry>
 	<entry>15&nbsp;November&nbsp;2017</entry>
 	<entry><para>POSIX shm allows jails to access global
 	    namespace</para></entry>
       </row>
 
       <row>
 	<entry><link
 	    xlink:href="&security.url;/FreeBSD-SA-17:10.kldstat.asc">FreeBSD-SA-17:10.kldstat</link></entry>
 	<entry>15&nbsp;November&nbsp;2017</entry>
 	<entry><para>Information leak</para></entry>
       </row>
 
       <row>
 	<entry><link
 	    xlink:href="&security.url;/FreeBSD-SA-17:11.openssl.asc">FreeBSD-SA-17:11.openssl</link></entry>
 	<entry>29&nbsp;November&nbsp;2017</entry>
 	<entry><para>Multiple vulnerabilities</para></entry>
       </row>
 
       <row>
 	<entry><link
 	    xlink:href="&security.url;/FreeBSD-SA-17:12.openssl.asc">FreeBSD-SA-17:12.openssl</link></entry>
 	<entry>09&nbsp;December&nbsp;2017</entry>
 	<entry><para>Multiple vulnerabilities</para></entry>
       </row>
 
       <row>
 	<entry><link
 	    xlink:href="&security.url;/FreeBSD-SA-18:01.ipsec.asc">FreeBSD-SA-18:01.ipsec</link></entry>
 	<entry>07&nbsp;March&nbsp;2018</entry>
 	<entry><para>Fix <acronym>IPSEC</acronym> validation and
 	  use-after-free</para></entry>
       </row>
 
       <row>
 	<entry><link
 	    xlink:href="&security.url;/FreeBSD-SA-18:02.ntp.asc">FreeBSD-SA-18:02.ntp</link></entry>
 	<entry>07&nbsp;March&nbsp;2018</entry>
 	<entry><para>Multiple vulnerabilities</para></entry>
       </row>
 
       <row>
 	<entry><link
 	    xlink:href="&security.url;/FreeBSD-SA-18:04.vt.asc">FreeBSD-SA-18:04.vt</link></entry>
 	<entry>04&nbsp;April&nbsp;2018</entry>
 	<entry><para>Fix &man.vt.4; console memory
 	    disclosure</para></entry>
       </row>
 
       <row>
 	<entry><link
 	    xlink:href="&security.url;/FreeBSD-SA-18:05.ipsec.asc">FreeBSD-SA-18:05.ipsec</link></entry>
 	<entry>04&nbsp;April&nbsp;2018</entry>
 	<entry><para>Fix denial of service</para></entry>
       </row>
+
+      <row>
+	<entry><link
+	    xlink:href="&security.url;/FreeBSD-SA-18:06.debugreg.asc">FreeBSD-SA-18:06.debugreg</link></entry>
+	<entry>08&nbsp;May&nbsp;2018</entry>
+	<entry><para>Mishandling of x86 debug
+	    exceptions</para></entry>
+      </row>
     </tbody>
   </tgroup>
 </informaltable>
Index: stable/11/release/doc/share/xml/errata.xml
===================================================================
--- stable/11/release/doc/share/xml/errata.xml	(revision 333375)
+++ stable/11/release/doc/share/xml/errata.xml	(revision 333376)
@@ -1,77 +1,93 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
 
      $FreeBSD$
 -->
 <informaltable frame="none" pgwide="1">
   <tgroup cols="3">
     <colspec colwidth="40%"/>
     <colspec colwidth="30%"/>
     <colspec colwidth="30%"/>
     <thead>
       <row>
 	<entry>Errata</entry>
 	<entry>Date</entry>
 	<entry>Topic</entry>
       </row>
     </thead>
 
     <tbody>
       <row>
 	<entry><link
 	    xlink:href="&security.url;/FreeBSD-EN-17:07.vnet.asc">FreeBSD-EN-17:07.vnet</link></entry>
 	<entry>10&nbsp;August&nbsp;2017</entry>
 	<entry><para>VNET kernel panic with asynchronous
 	    I/O</para></entry>
       </row>
 
       <row>
 	<entry><link
 	    xlink:href="&security.url;/FreeBSD-EN-17:08.pf.asc">FreeBSD-EN-17:08.pf</link></entry>
 	<entry>10&nbsp;August&nbsp;2017</entry>
 	<entry><para>&man.pf.4; housekeeping thread causes kernel
 	    panic</para></entry>
       </row>
 
       <row>
 	<entry><link
 	    xlink:href="&security.url;/FreeBSD-EN-17:09.tzdata.asc">FreeBSD-EN-17:09.tzdata</link></entry>
 	<entry>2&nbsp;November&nbsp;2017</entry>
 	<entry><para>Timezone database information
 	    update</para></entry>
       </row>
 
       <row>
 	<entry><link
 	    xlink:href="&security.url;/FreeBSD-EN-18:01.tzdata.asc">FreeBSD-EN-18:01.tzdata</link></entry>
 	<entry>07&nbsp;March&nbsp;2018</entry>
 	<entry><para>Timezone database information
 	    update</para></entry>
       </row>
 
       <row>
 	<entry><link
 	    xlink:href="&security.url;/FreeBSD-EN-18:02.file.asc">FreeBSD-EN-18:02.file</link></entry>
 	<entry>07&nbsp;March&nbsp;2018</entry>
 	<entry><para>Stack-based buffer overflow</para></entry>
       </row>
 
       <row>
 	<entry><link
 	    xlink:href="&security.url;/FreeBSD-EN-18:03.tzdata.asc">FreeBSD-EN-18:03.tzdata</link></entry>
 	<entry>04&nbsp;April&nbsp;2018</entry>
 	<entry><para>Update timezone database
 	    information</para></entry>
       </row>
 
       <row>
 	<entry><link
 	    xlink:href="&security.url;/FreeBSD-EN-18:04.mem.asc">FreeBSD-EN-18:04.mem</link></entry>
 	<entry>04&nbsp;April&nbsp;2018</entry>
 	<entry><para>Multiple small kernel memory
 	    disclosures</para></entry>
       </row>
+
+      <row>
+	<entry><link
+	    xlink:href="&security.url;/FreeBSD-EN-18:05.mem.asc">FreeBSD-EN-18:05.mem</link></entry>
+	<entry>08&nbsp;May&nbsp;2018</entry>
+	<entry><para>Multiple small kernel memory
+	    disclosures</para></entry>
+      </row>
+
+      <row>
+	<entry><link
+	    xlink:href="&security.url;/FreeBSD-EN-18:06.tzdata.asc">FreeBSD-EN-18:06.tzdata</link></entry>
+	<entry>08&nbsp;May&nbsp;2018</entry>
+	<entry><para>Update timezone database
+	    information</para></entry>
+      </row>
     </tbody>
   </tgroup>
 </informaltable>
Index: stable/11/release/doc/share/xml/security.xml
===================================================================
--- stable/11/release/doc/share/xml/security.xml	(revision 333375)
+++ stable/11/release/doc/share/xml/security.xml	(revision 333376)
@@ -1,111 +1,119 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <!--
      The FreeBSD Documentation Project
 
      $FreeBSD$
 -->
 <informaltable frame="none" pgwide="1">
   <tgroup cols="3">
     <colspec colwidth="40%"/>
     <colspec colwidth="30%"/>
     <colspec colwidth="30%"/>
     <thead>
       <row>
 	<entry>Advisory</entry>
 	<entry>Date</entry>
 	<entry>Topic</entry>
       </row>
     </thead>
 
     <tbody>
       <row>
 	<entry><link
 	    xlink:href="&security.url;/FreeBSD-SA-17:06.openssh.asc">FreeBSD-SA-17:06.openssh</link></entry>
 	<entry>10&nbsp;August&nbsp;2017</entry>
 	<entry><para>Denial of Service vulnerability</para></entry>
       </row>
 
       <row>
 	<entry><link
 	    xlink:href="&security.url;/FreeBSD-SA-17:07.wpa.asc">FreeBSD-SA-17:07.wpa</link></entry>
 	<entry>16&nbsp;October&nbsp;2017</entry>
 	<entry><para>WPA2 protocol vulnerability</para></entry>
       </row>
 
       <row>
 	<entry><link
 	    xlink:href="&security.url;/FreeBSD-SA-17:08.ptrace.asc">FreeBSD-SA-17:08.ptrace</link></entry>
 	<entry>15&nbsp;November&nbsp;2017</entry>
 	<entry><para>Kernel data leak via
 	    <function>ptrace(PT_LWPINFO)</function></para></entry>
       </row>
 
       <row>
 	<entry><link
 	    xlink:href="&security.url;/FreeBSD-SA-17:10.kldstat.asc">FreeBSD-SA-17:10.kldstat</link></entry>
 	<entry>15&nbsp;November&nbsp;2017</entry>
 	<entry><para>Information leak</para></entry>
       </row>
 
       <row>
 	<entry><link
 	    xlink:href="&security.url;/FreeBSD-SA-17:11.openssl.asc">FreeBSD-SA-17:11.openssl</link></entry>
 	<entry>29&nbsp;November&nbsp;2017</entry>
 	<entry><para>Multiple vulnerabilities</para></entry>
       </row>
 
       <row>
 	<entry><link
 	    xlink:href="&security.url;/FreeBSD-SA-17:12.openssl.asc">FreeBSD-SA-17:12.openssl</link></entry>
 	<entry>09&nbsp;December&nbsp;2017</entry>
 	<entry><para>Multiple vulnerabilities</para></entry>
       </row>
 
       <row>
 	<entry><link
 	    xlink:href="&security.url;/FreeBSD-SA-18:01.ipsec.asc">FreeBSD-SA-18:01.ipsec</link></entry>
 	<entry>07&nbsp;March&nbsp;2018</entry>
 	<entry><para>Fix <acronym>IPSEC</acronym> validation and
 	  use-after-free</para></entry>
       </row>
 
       <row>
 	<entry><link
 	    xlink:href="&security.url;/FreeBSD-SA-18:02.ntp.asc">FreeBSD-SA-18:02.ntp</link></entry>
 	<entry>07&nbsp;March&nbsp;2018</entry>
 	<entry><para>Multiple vulnerabilities</para></entry>
       </row>
 
       <row>
 	<entry><link
 	    xlink:href="&security.url;/FreeBSD-SA-18:03.speculative_execution.asc">FreeBSD-SA-18:03.speculative_execution</link></entry>
 	<entry>14&nbsp;March&nbsp;2018</entry>
 	<entry>
 	  <para>Speculative Execution Vulnerabilities</para>
 	  <note>
 	    <para>This advisory addresses the most significant issues
 	      for &os;&nbsp;11.1 on &arch.amd64; CPUs.  We expect to
 	      update this advisory to include 10.x for &arch.amd64;
 	      CPUs.  Future &os; releases will address this issue on
 	      &arch.i386; and other CPUs.</para>
 	  </note>
 	</entry>
       </row>
 
       <row>
 	<entry><link
 	    xlink:href="&security.url;/FreeBSD-SA-18:04.vt.asc">FreeBSD-SA-18:04.vt</link></entry>
 	<entry>04&nbsp;April&nbsp;2018</entry>
 	<entry><para>Fix &man.vt.4; console memory
 	    disclosure</para></entry>
       </row>
 
       <row>
 	<entry><link
 	    xlink:href="&security.url;/FreeBSD-SA-18:05.ipsec.asc">FreeBSD-SA-18:05.ipsec</link></entry>
 	<entry>04&nbsp;April&nbsp;2018</entry>
 	<entry><para>Fix denial of service</para></entry>
       </row>
+
+      <row>
+	<entry><link
+	    xlink:href="&security.url;/FreeBSD-SA-18:06.debugreg.asc">FreeBSD-SA-18:06.debugreg</link></entry>
+	<entry>08&nbsp;May&nbsp;2018</entry>
+	<entry><para>Mishandling of x86 debug
+	    exceptions</para></entry>
+      </row>
     </tbody>
   </tgroup>
 </informaltable>