diff --git a/share/sgml/man-refs.ent b/share/sgml/man-refs.ent
index 35a1e5e70e..8f4c580287 100644
--- a/share/sgml/man-refs.ent
+++ b/share/sgml/man-refs.ent
@@ -7,6 +7,12 @@
      for "foo.bar" would exist. Hopefully the chance of this is 
      sufficiently small that it is not an issue.
 
+     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.
+
      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
      should be in one contiguous block, with a blank line separating the
@@ -20,8 +26,8 @@
 <!ENTITY man...1 "<citerefentry/<refentrytitle/[/<manvolnum/1//">
 <!ENTITY man.CC.1 "<citerefentry/<refentrytitle/CC/<manvolnum/1//">
 <!ENTITY man.Mail.1 "<citerefentry/<refentrytitle/Mail/<manvolnum/1//">
-<!ENTITY man.X.1 "<citerefentry/<refentrytitle/X/<manvolnum/1//">
-<!ENTITY man.XFree86.1 "<citerefentry/<refentrytitle/XFree86/<manvolnum/1//">
+<!ENTITY man.X.1 "<citerefentry vendor='xfree86'/<refentrytitle/X/<manvolnum/1//">
+<!ENTITY man.XFree86.1 "<citerefentry vendor='xfree86'/<refentrytitle/XFree86/<manvolnum/1//">
 <!ENTITY man.a2p.1 "<citerefentry/<refentrytitle/a2p/<manvolnum/1//">
 <!ENTITY man.addftinfo.1 "<citerefentry/<refentrytitle/addftinfo/<manvolnum/1//">
 <!ENTITY man.addr2line.1 "<citerefentry/<refentrytitle/addr2line/<manvolnum/1//">
@@ -40,7 +46,7 @@
 <!ENTITY man.b64decode.1 "<citerefentry/<refentrytitle/b64decode/<manvolnum/1//">
 <!ENTITY man.b64encode.1 "<citerefentry/<refentrytitle/b64encode/<manvolnum/1//">
 <!ENTITY man.basename.1 "<citerefentry/<refentrytitle/basename/<manvolnum/1//">
-<!ENTITY man.bash.1 "<citerefentry/<refentrytitle/bash/<manvolnum/1//">
+<!ENTITY man.bash.1 "<citerefentry vendor='ports'/<refentrytitle/bash/<manvolnum/1//">
 <!ENTITY man.batch.1 "<citerefentry/<refentrytitle/batch/<manvolnum/1//">
 <!ENTITY man.bc.1 "<citerefentry/<refentrytitle/bc/<manvolnum/1//">
 <!ENTITY man.bdes.1 "<citerefentry/<refentrytitle/bdes/<manvolnum/1//">
@@ -67,7 +73,7 @@
 <!ENTITY man.cccp.1 "<citerefentry/<refentrytitle/cccp/<manvolnum/1//">
 <!ENTITY man.cd.1 "<citerefentry/<refentrytitle/cd/<manvolnum/1//">
 <!ENTITY man.cdcontrol.1 "<citerefentry/<refentrytitle/cdcontrol/<manvolnum/1//">
-<!ENTITY man.cdrecord.1 "<citerefentry/<refentrytitle/cdrecord/<manvolnum/1//">
+<!ENTITY man.cdrecord.1 "<citerefentry vendor='ports'/<refentrytitle/cdrecord/<manvolnum/1//">
 <!ENTITY man.chdir.1 "<citerefentry/<refentrytitle/chdir/<manvolnum/1//">
 <!ENTITY man.checknr.1 "<citerefentry/<refentrytitle/checknr/<manvolnum/1//">
 <!ENTITY man.chflags.1 "<citerefentry/<refentrytitle/chflags/<manvolnum/1//">
@@ -113,13 +119,13 @@
 <!ENTITY man.cursor.1 "<citerefentry/<refentrytitle/cursor/<manvolnum/1//">
 <!ENTITY man.cut.1 "<citerefentry/<refentrytitle/cut/<manvolnum/1//">
 <!ENTITY man.cvs.1 "<citerefentry/<refentrytitle/cvs/<manvolnum/1//">
-<!ENTITY man.cvsup.1 "<citerefentry/<refentrytitle/cvsup/<manvolnum/1//">
+<!ENTITY man.cvsup.1 "<citerefentry vendor='ports'/<refentrytitle/cvsup/<manvolnum/1//">
 <!ENTITY man.date.1 "<citerefentry/<refentrytitle/date/<manvolnum/1//">
 <!ENTITY man.dc.1 "<citerefentry/<refentrytitle/dc/<manvolnum/1//">
 <!ENTITY man.dd.1 "<citerefentry/<refentrytitle/dd/<manvolnum/1//">
 <!ENTITY man.default.1 "<citerefentry/<refentrytitle/default/<manvolnum/1//">
 <!ENTITY man.df.1 "<citerefentry/<refentrytitle/df/<manvolnum/1//">
-<!ENTITY man.dga.1 "<citerefentry/<refentrytitle/dga/<manvolnum/1//">
+<!ENTITY man.dga.1 "<citerefentry vendor='xfree86'/<refentrytitle/dga/<manvolnum/1//">
 <!ENTITY man.dialog.1 "<citerefentry/<refentrytitle/dialog/<manvolnum/1//">
 <!ENTITY man.diff.1 "<citerefentry/<refentrytitle/diff/<manvolnum/1//">
 <!ENTITY man.diff3.1 "<citerefentry/<refentrytitle/diff3/<manvolnum/1//">
@@ -132,7 +138,7 @@
 <!ENTITY man.domainname.1 "<citerefentry/<refentrytitle/domainname/<manvolnum/1//">
 <!ENTITY man.done.1 "<citerefentry/<refentrytitle/done/<manvolnum/1//">
 <!ENTITY man.doscmd.1 "<citerefentry/<refentrytitle/doscmd/<manvolnum/1//">
-<!ENTITY man.dprofpp.1 "<citerefentry/<refentrytitle/dprofpp/<manvolnum/1//">
+<!ENTITY man.dprofpp.1 "<citerefentry vendor='ports'/<refentrytitle/dprofpp/<manvolnum/1//">
 <!ENTITY man.dtmfdecode.1 "<citerefentry/<refentrytitle/dtmfdecode/<manvolnum/1//">
 <!ENTITY man.du.1 "<citerefentry/<refentrytitle/du/<manvolnum/1//">
 <!ENTITY man.echo.1 "<citerefentry/<refentrytitle/echo/<manvolnum/1//">
@@ -143,7 +149,7 @@
 <!ENTITY man.egrep.1 "<citerefentry/<refentrytitle/egrep/<manvolnum/1//">
 <!ENTITY man.elif.1 "<citerefentry/<refentrytitle/elif/<manvolnum/1//">
 <!ENTITY man.else.1 "<citerefentry/<refentrytitle/else/<manvolnum/1//">
-<!ENTITY man.emacs.1 "<citerefentry/<refentrytitle/emacs/<manvolnum/1//">
+<!ENTITY man.emacs.1 "<citerefentry vendor='ports'/<refentrytitle/emacs/<manvolnum/1//">
 <!ENTITY man.end.1 "<citerefentry/<refentrytitle/end/<manvolnum/1//">
 <!ENTITY man.endif.1 "<citerefentry/<refentrytitle/endif/<manvolnum/1//">
 <!ENTITY man.endsw.1 "<citerefentry/<refentrytitle/endsw/<manvolnum/1//">
@@ -214,7 +220,7 @@
 <!ENTITY man.grops.1 "<citerefentry/<refentrytitle/grops/<manvolnum/1//">
 <!ENTITY man.grotty.1 "<citerefentry/<refentrytitle/grotty/<manvolnum/1//">
 <!ENTITY man.groups.1 "<citerefentry/<refentrytitle/groups/<manvolnum/1//">
-<!ENTITY man.gs.1 "<citerefentry/<refentrytitle/gs/<manvolnum/1//">
+<!ENTITY man.gs.1 "<citerefentry vendor='ports'/<refentrytitle/gs/<manvolnum/1//">
 <!ENTITY man.gunzip.1 "<citerefentry/<refentrytitle/gunzip/<manvolnum/1//">
 <!ENTITY man.gzcat.1 "<citerefentry/<refentrytitle/gzcat/<manvolnum/1//">
 <!ENTITY man.gzexe.1 "<citerefentry/<refentrytitle/gzexe/<manvolnum/1//">
@@ -235,8 +241,8 @@
 <!ENTITY man.ident.1 "<citerefentry/<refentrytitle/ident/<manvolnum/1//">
 <!ENTITY man.idprio.1 "<citerefentry/<refentrytitle/idprio/<manvolnum/1//">
 <!ENTITY man.if.1 "<citerefentry/<refentrytitle/if/<manvolnum/1//">
-<!ENTITY man.imake.1 "<citerefentry/<refentrytitle/imake/<manvolnum/1//">
-<!ENTITY man.imwheel.1 "<citerefentry/<refentrytitle/imwheel/<manvolnum/1//">
+<!ENTITY man.imake.1 "<citerefentry vendor='ports'/<refentrytitle/imake/<manvolnum/1//">
+<!ENTITY man.imwheel.1 "<citerefentry vendor='ports'/<refentrytitle/imwheel/<manvolnum/1//">
 <!ENTITY man.indent.1 "<citerefentry/<refentrytitle/indent/<manvolnum/1//">
 <!ENTITY man.indxbib.1 "<citerefentry/<refentrytitle/indxbib/<manvolnum/1//">
 <!ENTITY man.info.1 "<citerefentry/<refentrytitle/info/<manvolnum/1//">
@@ -308,7 +314,7 @@
 <!ENTITY man.ls.1 "<citerefentry/<refentrytitle/ls/<manvolnum/1//">
 <!ENTITY man.ls-F.1 "<citerefentry/<refentrytitle/ls-F/<manvolnum/1//">
 <!ENTITY man.lsvfs.1 "<citerefentry/<refentrytitle/lsvfs/<manvolnum/1//">
-<!ENTITY man.lynx.1 "<citerefentry/<refentrytitle/lynx/<manvolnum/1//">
+<!ENTITY man.lynx.1 "<citerefentry vendor='ports'/<refentrytitle/lynx/<manvolnum/1//">
 <!ENTITY man.m4.1 "<citerefentry/<refentrytitle/m4/<manvolnum/1//">
 <!ENTITY man.mail.1 "<citerefentry/<refentrytitle/mail/<manvolnum/1//">
 <!ENTITY man.mailq.1 "<citerefentry/<refentrytitle/mailq/<manvolnum/1//">
@@ -350,7 +356,7 @@
 <!ENTITY man.nohup.1 "<citerefentry/<refentrytitle/nohup/<manvolnum/1//">
 <!ENTITY man.notify.1 "<citerefentry/<refentrytitle/notify/<manvolnum/1//">
 <!ENTITY man.nroff.1 "<citerefentry/<refentrytitle/nroff/<manvolnum/1//">
-<!ENTITY man.nsgmls.1 "<citerefentry/<refentrytitle/nsgmls/<manvolnum/1//">
+<!ENTITY man.nsgmls.1 "<citerefentry vendor='ports'/<refentrytitle/nsgmls/<manvolnum/1//">
 <!ENTITY man.nvi.1 "<citerefentry/<refentrytitle/nvi/<manvolnum/1//">
 <!ENTITY man.nview.1 "<citerefentry/<refentrytitle/nview/<manvolnum/1//">
 <!ENTITY man.objcopy.1 "<citerefentry/<refentrytitle/objcopy/<manvolnum/1//">
@@ -456,7 +462,7 @@
 <!ENTITY man.pod2html.1 "<citerefentry/<refentrytitle/pod2html/<manvolnum/1//">
 <!ENTITY man.pod2man.1 "<citerefentry/<refentrytitle/pod2man/<manvolnum/1//">
 <!ENTITY man.popd.1 "<citerefentry/<refentrytitle/popd/<manvolnum/1//">
-<!ENTITY man.portlint.1 "<citerefentry/<refentrytitle/portlint/<manvolnum/1//">
+<!ENTITY man.portlint.1 "<citerefentry vendor='ports'/<refentrytitle/portlint/<manvolnum/1//">
 <!ENTITY man.pr.1 "<citerefentry/<refentrytitle/pr/<manvolnum/1//">
 <!ENTITY man.printenv.1 "<citerefentry/<refentrytitle/printenv/<manvolnum/1//">
 <!ENTITY man.printf.1 "<citerefentry/<refentrytitle/printf/<manvolnum/1//">
@@ -517,7 +523,7 @@
 <!ENTITY man.setty.1 "<citerefentry/<refentrytitle/setty/<manvolnum/1//">
 <!ENTITY man.setvar.1 "<citerefentry/<refentrytitle/setvar/<manvolnum/1//">
 <!ENTITY man.sftp.1 "<citerefentry/<refentrytitle/sftp/<manvolnum/1//">
-<!ENTITY man.sgmlnorm.1 "<citerefentry/<refentrytitle/sgmlnorm/<manvolnum/1//">
+<!ENTITY man.sgmlnorm.1 "<citerefentry vendor='ports'/<refentrytitle/sgmlnorm/<manvolnum/1//">
 <!ENTITY man.sgsc.1 "<citerefentry/<refentrytitle/sgsc/<manvolnum/1//">
 <!ENTITY man.sh.1 "<citerefentry/<refentrytitle/sh/<manvolnum/1//">
 <!ENTITY man.shar.1 "<citerefentry/<refentrytitle/shar/<manvolnum/1//">
@@ -538,7 +544,7 @@
 <!ENTITY man.ssh-keygen.1 "<citerefentry/<refentrytitle/ssh-keygen/<manvolnum/1//">
 <!ENTITY man.ssh-keyscan.1 "<citerefentry/<refentrytitle/ssh-keyscan/<manvolnum/1//">
 <!ENTITY man.startslip.1 "<citerefentry/<refentrytitle/startslip/<manvolnum/1//">
-<!ENTITY man.startx.1 "<citerefentry/<refentrytitle/startx/<manvolnum/1//">
+<!ENTITY man.startx.1 "<citerefentry vendor='xfree86'/<refentrytitle/startx/<manvolnum/1//">
 <!ENTITY man.stat.1 "<citerefentry/<refentrytitle/stat/<manvolnum/1//">
 <!ENTITY man.stop.1 "<citerefentry/<refentrytitle/stop/<manvolnum/1//">
 <!ENTITY man.strings.1 "<citerefentry/<refentrytitle/strings/<manvolnum/1//">
@@ -621,12 +627,12 @@
 <!ENTITY man.vidcontrol.1 "<citerefentry/<refentrytitle/vidcontrol/<manvolnum/1//">
 <!ENTITY man.vidfont.1 "<citerefentry/<refentrytitle/vidfont/<manvolnum/1//">
 <!ENTITY man.view.1 "<citerefentry/<refentrytitle/view/<manvolnum/1//">
-<!ENTITY man.vim.1 "<citerefentry/<refentrytitle/vim/<manvolnum/1//">
+<!ENTITY man.vim.1 "<citerefentry vendor='ports'/<refentrytitle/vim/<manvolnum/1//">
 <!ENTITY man.vis.1 "<citerefentry/<refentrytitle/vis/<manvolnum/1//">
 <!ENTITY man.vt220keys.1 "<citerefentry/<refentrytitle/vt220keys/<manvolnum/1//">
 <!ENTITY man.vttest.1 "<citerefentry/<refentrytitle/vttest/<manvolnum/1//">
 <!ENTITY man.w.1 "<citerefentry/<refentrytitle/w/<manvolnum/1//">
-<!ENTITY man.w3m.1 "<citerefentry/<refentrytitle/w3m/<manvolnum/1//">
+<!ENTITY man.w3m.1 "<citerefentry vendor='ports'/<refentrytitle/w3m/<manvolnum/1//">
 <!ENTITY man.wait.1 "<citerefentry/<refentrytitle/wait/<manvolnum/1//">
 <!ENTITY man.wall.1 "<citerefentry/<refentrytitle/wall/<manvolnum/1//">
 <!ENTITY man.wc.1 "<citerefentry/<refentrytitle/wc/<manvolnum/1//">
@@ -642,15 +648,15 @@
 <!ENTITY man.window.1 "<citerefentry/<refentrytitle/window/<manvolnum/1//">
 <!ENTITY man.write.1 "<citerefentry/<refentrytitle/write/<manvolnum/1//">
 <!ENTITY man.xargs.1 "<citerefentry/<refentrytitle/xargs/<manvolnum/1//">
-<!ENTITY man.xdm.1 "<citerefentry/<refentrytitle/xdm/<manvolnum/1//">
-<!ENTITY man.xdpyinfo.1 "<citerefentry/<refentrytitle/xdpyinfo/<manvolnum/1//">
-<!ENTITY man.xfontsel.1 "<citerefentry/<refentrytitle/xfontsel/<manvolnum/1//">
-<!ENTITY man.xmodmap.1 "<citerefentry/<refentrytitle/xmodmap/<manvolnum/1//">
-<!ENTITY man.xset.1 "<citerefentry/<refentrytitle/xset/<manvolnum/1//">
+<!ENTITY man.xdm.1 "<citerefentry vendor='xfree86'/<refentrytitle/xdm/<manvolnum/1//">
+<!ENTITY man.xdpyinfo.1 "<citerefentry vendor='xfree86'/<refentrytitle/xdpyinfo/<manvolnum/1//">
+<!ENTITY man.xfontsel.1 "<citerefentry vendor='xfree86'/<refentrytitle/xfontsel/<manvolnum/1//">
+<!ENTITY man.xmodmap.1 "<citerefentry vendor='xfree86'/<refentrytitle/xmodmap/<manvolnum/1//">
+<!ENTITY man.xset.1 "<citerefentry vendor='xfree86'/<refentrytitle/xset/<manvolnum/1//">
 <!ENTITY man.xstr.1 "<citerefentry/<refentrytitle/xstr/<manvolnum/1//">
 <!ENTITY man.xten.1 "<citerefentry/<refentrytitle/xten/<manvolnum/1//">
 <!ENTITY man.xterm.1 "<citerefentry vendor='xfree86'/<refentrytitle/xterm/<manvolnum/1//">
-<!ENTITY man.xvidtune.1 "<citerefentry/<refentrytitle/xvidtune/<manvolnum/1//">
+<!ENTITY man.xvidtune.1 "<citerefentry vendor='xfree86'/<refentrytitle/xvidtune/<manvolnum/1//">
 <!ENTITY man.yacc.1 "<citerefentry/<refentrytitle/yacc/<manvolnum/1//">
 <!ENTITY man.yes.1 "<citerefentry/<refentrytitle/yes/<manvolnum/1//">
 <!ENTITY man.ypcat.1 "<citerefentry/<refentrytitle/ypcat/<manvolnum/1//">
@@ -3578,7 +3584,7 @@
 <!ENTITY man.mfs.8 "<citerefentry/<refentrytitle/mfs/<manvolnum/8//">
 <!ENTITY man.mixer.8 "<citerefentry/<refentrytitle/mixer/<manvolnum/8//">
 <!ENTITY man.mk-amd-map.8 "<citerefentry/<refentrytitle/mk-amd-map/<manvolnum/8//">
-<!ENTITY man.mkisofs.8 "<citerefentry/<refentrytitle/mkisofs/<manvolnum/8//">
+<!ENTITY man.mkisofs.8 "<citerefentry vendor='ports'/<refentrytitle/mkisofs/<manvolnum/8//">
 <!ENTITY man.mknetid.8 "<citerefentry/<refentrytitle/mknetid/<manvolnum/8//">
 <!ENTITY man.mknod.8 "<citerefentry/<refentrytitle/mknod/<manvolnum/8//">
 <!ENTITY man.mld6query.8 "<citerefentry/<refentrytitle/mld6query/<manvolnum/8//">