diff --git a/en_US.ISO8859-1/books/handbook/basics/chapter.sgml b/en_US.ISO8859-1/books/handbook/basics/chapter.sgml
index a13aed3b43..6326eebf0a 100644
--- a/en_US.ISO8859-1/books/handbook/basics/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/basics/chapter.sgml
@@ -1336,7 +1336,7 @@ Swap: 256M Total, 38M Used, 217M Free, 15% Inuse
 	  Instead of having to create and modify device nodes,
 	  <literal>DEVFS</literal> maintains this particular filesystem for you.</para>
 
-	<para>See the &man.devfs.5; manual page for more
+	<para>See the &man.current.devfs.5; manual page for more
 	  information.</para>
 
 	<para><literal>DEVFS</literal> is used by default in FreeBSD&nbsp;5.0.</para>
diff --git a/en_US.ISO8859-1/books/handbook/boot/chapter.sgml b/en_US.ISO8859-1/books/handbook/boot/chapter.sgml
index e864a4d23e..ac31c4b30c 100644
--- a/en_US.ISO8859-1/books/handbook/boot/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/boot/chapter.sgml
@@ -579,7 +579,7 @@ boot:</screen>
     <title>Device Hints</title>
 
     <para>During initial system startup, the boot &man.loader.8; will read the
-      &man.device.hints.5; file.  This file stores kernel boot information
+      &man.current.device.hints.5; file.  This file stores kernel boot information
       known as variables, sometimes referred to as <quote>device hints</quote>.</para>
 
     <para>Setup of this file is one variable per line, using the standard hash
@@ -631,7 +631,7 @@ boot:</screen>
 
     <para>Device drivers may accept (or require) more hints not listed here, viewing
       their manual page is recommended.  For more information, consult the
-      &man.device.hints.5;, &man.kenv.1;, &man.loader.conf.5;, and &man.loader.8;
+      &man.current.device.hints.5;, &man.kenv.1;, &man.loader.conf.5;, and &man.loader.8;
       manual pages.</para>
   </sect1>
 
diff --git a/share/sgml/man-refs.ent b/share/sgml/man-refs.ent
index b5f5d490ff..cf1c9801be 100644
--- a/share/sgml/man-refs.ent
+++ b/share/sgml/man-refs.ent
@@ -9,9 +9,12 @@
 
      If the manual page does not belong to the base system, you have to
      set the vendor attribute, in order to select the right manual page
-     collection.  Three different vendor values are available at this
-     moment: xfree86, ports and netbsd.  Look at man.X.1 entry for an
-     example.
+     collection.  Four different vendor values are available at this
+     moment: xfree86, ports, netbsd and current.  Look at man.X.1 entry for an
+     example.  In the case of the use of -CURRENT manual pages, the
+     entity form will be &man.current.foo.1;  This form is only used for
+     -CURRENT manual pages in documentations not for release
+     documentation.
 
      Please keep these in order so that the lazier types can automate
      the task of editing this file.  All the man pages in one section
@@ -3248,7 +3251,8 @@
 <!ENTITY man.ctm.5 "<citerefentry/<refentrytitle/ctm/<manvolnum/5//">
 <!ENTITY man.cvs.5 "<citerefentry/<refentrytitle/cvs/<manvolnum/5//">
 <!ENTITY man.devfs.5 "<citerefentry/<refentrytitle/devfs/<manvolnum/5//">
-<!ENTITY man.device.hints.5 "<citerefentry/<refentrytitle/device.hints/<manvolnum/5//">
+<!ENTITY man.current.devfs.5 "<citerefentry vendor='current'/<refentrytitle/devfs/<manvolnum/5//">
+<!ENTITY man.current.device.hints.5 "<citerefentry vendor='current'/<refentrytitle/device.hints/<manvolnum/5//">
 <!ENTITY man.dhclient.conf.5 "<citerefentry/<refentrytitle/dhclient.conf/<manvolnum/5//">
 <!ENTITY man.dhclient.leases.5 "<citerefentry/<refentrytitle/dhclient.leases/<manvolnum/5//">
 <!ENTITY man.dhcp-options.5 "<citerefentry/<refentrytitle/dhcp-options/<manvolnum/5//">