diff --git a/en_US.ISO8859-1/books/porters-handbook/versions/chapter.xml b/en_US.ISO8859-1/books/porters-handbook/versions/chapter.xml
index dcdd255af4..38a471e408 100644
--- a/en_US.ISO8859-1/books/porters-handbook/versions/chapter.xml
+++ b/en_US.ISO8859-1/books/porters-handbook/versions/chapter.xml
@@ -612,7 +612,7 @@ is spelled &amp;, < is &lt; and > is &gt;.
 	    <entry><revnumber>r332100</revnumber></entry>
 	    <entry>April 6, 2018</entry>
 	    <entry>12.0-CURRENT after changing
-	      <function>syslog(3)</function> to emit RFC 5424 formatted
+	      &man.syslog.3; to emit RFC 5424 formatted
 	      messages.</entry>
 	  </row>
 
@@ -628,7 +628,7 @@ is spelled &amp;, < is &lt; and > is &gt;.
 	    <entry><revnumber>r333446</revnumber></entry>
 	    <entry>May 10, 2018</entry>
 	    <entry>12.0-CURRENT after reworking CTL frontend and backend
-	      options to use nv(3), allow creating multiple ioctl
+	      options to use &man.nv.3;, allow creating multiple ioctl
 	      frontend ports.</entry>
 	  </row>
 
@@ -644,7 +644,7 @@ is spelled &amp;, < is &lt; and > is &gt;.
 	    <entry>1200065</entry>
 	    <entry><revnumber>r334290</revnumber></entry>
 	    <entry>May 28, 2018</entry>
-	    <entry>12.0-CURRENT after changing dwatch(1) to allow
+	    <entry>12.0-CURRENT after changing &man.dwatch.1; to allow
 	      '-E code' to override profile EVENT_DETAILS.</entry>
 	  </row>
 
@@ -695,7 +695,7 @@ is spelled &amp;, < is &lt; and > is &gt;.
 	    <entry><revnumber>r335930</revnumber></entry>
 	    <entry>July 4, 2018</entry>
 	    <entry>12.0-CURRENT after changing the ABI and API of
-	      <literal>epoch(9)</literal> (<revnumber>r335924</revnumber>)
+	      &man.epoch.9; (<revnumber>r335924</revnumber>)
 	      requiring modules of consumers to be rebuilt.</entry>
 	  </row>
 
@@ -2103,7 +2103,7 @@ is spelled &amp;, < is &lt; and > is &gt;.
 	    <entry>1101516</entry>
 	    <entry><revnumber>r334392</revnumber></entry>
 	    <entry>May 30, 2018</entry>
-	    <entry>11-STABLE after dwatch(1) touch-ups.</entry>
+	    <entry>11-STABLE after &man.dwatch.1; touch-ups.</entry>
 	  </row>
 
 	  <row>
diff --git a/share/xml/man-refs.ent b/share/xml/man-refs.ent
index 325ffd7774..bce8730f9a 100644
--- a/share/xml/man-refs.ent
+++ b/share/xml/man-refs.ent
@@ -9817,6 +9817,7 @@
 <!ENTITY man.drbr.stats.update.9 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>drbr_stats_update</refentrytitle><manvolnum>9</manvolnum></citerefentry>">
 <!ENTITY man.driver.9 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>driver</refentrytitle><manvolnum>9</manvolnum></citerefentry>">
 <!ENTITY man.endtsleep.9 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>endtsleep</refentrytitle><manvolnum>9</manvolnum></citerefentry>">
+<!ENTITY man.epoch.9 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>epoch</refentrytitle><manvolnum>9</manvolnum></citerefentry>">
 <!ENTITY man.et.ban.9 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>et_ban</refentrytitle><manvolnum>9</manvolnum></citerefentry>">
 <!ENTITY man.et.deregister.9 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>et_deregister</refentrytitle><manvolnum>9</manvolnum></citerefentry>">
 <!ENTITY man.et.find.9 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>et_find</refentrytitle><manvolnum>9</manvolnum></citerefentry>">