diff --git a/share/xml/man-refs.ent b/share/xml/man-refs.ent
index cf9b5229a4..508f616403 100644
--- a/share/xml/man-refs.ent
+++ b/share/xml/man-refs.ent
@@ -499,43 +499,8 @@
 <!ENTITY man.pgrep.1 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pgrep</refentrytitle><manvolnum>1</manvolnum></citerefentry>">
 <!ENTITY man.pic.1 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pic</refentrytitle><manvolnum>1</manvolnum></citerefentry>">
 <!ENTITY man.pim6stat.1 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pim6stat</refentrytitle><manvolnum>1</manvolnum></citerefentry>">
-<!ENTITY man.pkg-add.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg-add</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
-<!ENTITY man.pkg-annotate.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg-annotate</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
-<!ENTITY man.pkg-audit.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg-audit</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
-<!ENTITY man.pkg-autoremove.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg-autoremove</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
-<!ENTITY man.pkg-backup.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg-backup</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
-<!ENTITY man.pkg-check.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg-check</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
-<!ENTITY man.pkg-clean.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg-clean</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
-<!ENTITY man.pkg-config.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg-config</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
-<!ENTITY man.pkg-convert.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg-convert</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
-<!ENTITY man.pkg-create.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg-create</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
-<!ENTITY man.pkg-delete.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg-delete</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
-<!ENTITY man.pkg-fetch.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg-fetch</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
-<!ENTITY man.pkg-info.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg-info</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
-<!ENTITY man.pkg-install.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg-install</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
-<!ENTITY man.pkg-lock.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg-lock</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
-<!ENTITY man.pkg-query.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg-query</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
-<!ENTITY man.pkg-register.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg-register</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
-<!ENTITY man.pkg-remove.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg-remove</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
-<!ENTITY man.pkg-repo.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg-repo</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
-<!ENTITY man.pkg-repository.5 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg-repository</refentrytitle><manvolnum>5</manvolnum></citerefentry>">
-<!ENTITY man.pkg-rquery.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg-rquery</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
-<!ENTITY man.pkg-search.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg-search</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
-<!ENTITY man.pkg-set.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg-set</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
-<!ENTITY man.pkg-shell.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg-shell</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
-<!ENTITY man.pkg-shlib.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg-shlib</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
-<!ENTITY man.pkg-static.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg-static</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
-<!ENTITY man.pkg-stats.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg-stats</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
-<!ENTITY man.pkg-unlock.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg-unlock</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
-<!ENTITY man.pkg-update.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg-update</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
-<!ENTITY man.pkg-updating.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg-updating</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
-<!ENTITY man.pkg-upgrade.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg-upgrade</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
-<!ENTITY man.pkg-version.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg-version</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
-<!ENTITY man.pkg-which.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg-which</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
-<!ENTITY man.pkg.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
 <!ENTITY man.pkg.add.1 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg_add</refentrytitle><manvolnum>1</manvolnum></citerefentry>">
 <!ENTITY man.pkg.check.1 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg_check</refentrytitle><manvolnum>1</manvolnum></citerefentry>">
-<!ENTITY man.pkg.conf.5 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>">
 <!ENTITY man.pkg.create.1 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg_create</refentrytitle><manvolnum>1</manvolnum></citerefentry>">
 <!ENTITY man.pkg.delete.1 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg_delete</refentrytitle><manvolnum>1</manvolnum></citerefentry>">
 <!ENTITY man.pkg.info.1 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg_info</refentrytitle><manvolnum>1</manvolnum></citerefentry>">
@@ -4124,6 +4089,8 @@
 <!ENTITY man.phones.5 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>phones</refentrytitle><manvolnum>5</manvolnum></citerefentry>">
 <!ENTITY man.pim6dd.conf.5 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pim6dd.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>">
 <!ENTITY man.pim6sd.conf.5 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pim6sd.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>">
+<!ENTITY man.pkg-repository.5 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg-repository</refentrytitle><manvolnum>5</manvolnum></citerefentry>">
+<!ENTITY man.pkg.conf.5 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>">
 <!ENTITY man.portsnap.conf.5 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>portsnap.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>">
 <!ENTITY man.printcap.5 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>printcap</refentrytitle><manvolnum>5</manvolnum></citerefentry>">
 <!ENTITY man.procfs.5 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>procfs</refentrytitle><manvolnum>5</manvolnum></citerefentry>">
@@ -4649,6 +4616,39 @@
 <!ENTITY man.pim6sd.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pim6sd</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
 <!ENTITY man.ping.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>ping</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
 <!ENTITY man.ping6.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>ping6</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
+<!ENTITY man.pkg.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
+<!ENTITY man.pkg-add.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg-add</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
+<!ENTITY man.pkg-annotate.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg-annotate</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
+<!ENTITY man.pkg-audit.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg-audit</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
+<!ENTITY man.pkg-autoremove.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg-autoremove</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
+<!ENTITY man.pkg-backup.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg-backup</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
+<!ENTITY man.pkg-check.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg-check</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
+<!ENTITY man.pkg-clean.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg-clean</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
+<!ENTITY man.pkg-config.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg-config</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
+<!ENTITY man.pkg-convert.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg-convert</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
+<!ENTITY man.pkg-create.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg-create</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
+<!ENTITY man.pkg-delete.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg-delete</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
+<!ENTITY man.pkg-fetch.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg-fetch</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
+<!ENTITY man.pkg-info.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg-info</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
+<!ENTITY man.pkg-install.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg-install</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
+<!ENTITY man.pkg-lock.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg-lock</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
+<!ENTITY man.pkg-query.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg-query</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
+<!ENTITY man.pkg-register.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg-register</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
+<!ENTITY man.pkg-remove.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg-remove</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
+<!ENTITY man.pkg-repo.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg-repo</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
+<!ENTITY man.pkg-rquery.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg-rquery</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
+<!ENTITY man.pkg-search.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg-search</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
+<!ENTITY man.pkg-set.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg-set</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
+<!ENTITY man.pkg-shell.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg-shell</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
+<!ENTITY man.pkg-shlib.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg-shlib</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
+<!ENTITY man.pkg-static.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg-static</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
+<!ENTITY man.pkg-stats.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg-stats</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
+<!ENTITY man.pkg-unlock.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg-unlock</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
+<!ENTITY man.pkg-update.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg-update</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
+<!ENTITY man.pkg-updating.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg-updating</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
+<!ENTITY man.pkg-upgrade.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg-upgrade</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
+<!ENTITY man.pkg-version.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg-version</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
+<!ENTITY man.pkg-which.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg-which</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
 <!ENTITY man.pmcannotate.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pmcannotate</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
 <!ENTITY man.pmccontrol.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pmccontrol</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
 <!ENTITY man.pmcstat.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pmcstat</refentrytitle><manvolnum>8</manvolnum></citerefentry>">