diff --git a/usr.sbin/pim6dd/pim6dd.conf.5 b/usr.sbin/pim6dd/pim6dd.conf.5
index 90271ae63fb1..763635470ca1 100644
--- a/usr.sbin/pim6dd/pim6dd.conf.5
+++ b/usr.sbin/pim6dd/pim6dd.conf.5
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$Id: pim6dd.conf.5,v 1.3 2000/05/05 14:43:18 sumikawa Exp $
+.\"	KAME Id: pim6dd.conf.5,v 1.4 2000/07/09 17:26:52 itojun Exp
 .\"	$FreeBSD$
 .\"
 .Dd Nov 17, 1998
@@ -37,7 +37,7 @@
 .\"
 .Sh DESCRIPTION
 The file describes how the
-.Nm pim6dd
+.Xr pim6dd 8
 daemon treats each interface on the system.
 By default(including the case where there is no configuration file),
 PIM will be activated on all interfaces, which can be overridden
@@ -54,7 +54,7 @@ There are four types of configuration commands:
 Specifies a default preference value when sending a PIM assert message.
 Preferences are used by assert elections to determine upstream routers.
 Currently
-.Nm
+.Xr pim6dd 8
 cannot reliably obtain preferences and metrics from the
 unicast routing protocols, so a default value may be configured.
 .\"
@@ -69,7 +69,7 @@ consulted. However, default metrics may also be set and will default to
 .Op disable
 .Xc
 Specifies
-.Nm
+.Xr pim6dd 8
 to ignore the interface even if the interface is multicast-capable.
 Interfaces are specified in the form of "name unit", such as
 .Ar gif0
@@ -94,7 +94,7 @@ the packet is not sent on the
 .Ar interfaces.
 Moreover, if there is no other interface than the specified
 interfaces,
-.Nm pim6dd
+.Xr pim6dd 8
 sends a prune message to the upstream neighbor.
 Valid formats of
 .Ar groupaddrs
@@ -137,20 +137,20 @@ filter ff18::1000-ff18::1050 gif3
 .Xr pim6dd 8
 .Sh HISTORY
 The
-.Nm pim6dd
+.Xr pim6dd 8
 command and the configuration file
 .Nm
 are based on
 .Nm pimdd ,
 which is an IPv4 multicast routing daemon
 developed at the University of Oregon.
-.Nm Pimdd
+.Nm pimdd
 has been derived from PIM sparse-mode
 .Nm pimd
 developed at University of Southern California.
 Part of these two programs above has also been derived from
-.Nm mrouted.
-.Nm Mrouted
+.Nm mrouted .
+.Nm mrouted
 is COPYRIGHT 1989 by The Board of Trustees of
 Leland Stanford Junior University.
 .Pp
diff --git a/usr.sbin/pim6sd/pim6sd.conf.5 b/usr.sbin/pim6sd/pim6sd.conf.5
index 074d6b630cf9..aac9fd869bbf 100644
--- a/usr.sbin/pim6sd/pim6sd.conf.5
+++ b/usr.sbin/pim6sd/pim6sd.conf.5
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$Id: pim6sd.conf.5,v 1.9 2000/05/05 14:57:14 sumikawa Exp $
+.\"	KAME Id: pim6sd.conf.5,v 1.10 2000/07/09 17:28:42 itojun Exp
 .\"	$FreeBSD$
 .\"
 .Dd Oct 6, 1999
@@ -37,7 +37,7 @@
 .\"
 .Sh DESCRIPTION
 The
-.Nm pim6sd
+.Nm
 configuration file consists of a sequence of statements terminated
 by a semi-colon (`;'), each of which specifies how the daemon treats
 each interface on the system, specifies some parameters of the PIM
@@ -50,7 +50,7 @@ Lines beginning with
 are comments.
 .\".Pp
 .\"Note that
-.\".Nm pim6sd
+.\".Xr pim6sd 8
 .\"works even without the configuration file, although the daemon
 .\"will warn that there is no configuration file.
 .\"In such a case, the daemon will automatically set the default value
@@ -104,7 +104,7 @@ By default, a hostname is not resolved.
 .Ic ;
 .Xc
 Specifies
-.Nm
+.Xr pim6sd 8
 to ignore the interface even if the interface is multicast-capable.
 Note that PIM will be activated on all interfaces by default(including
 the case where there is no configuration file).
@@ -125,7 +125,7 @@ assert message on the interface.
 If another optional parameter
 .Ic nolistener
 is specified,
-.Nm pim6sd
+.Xr pim6sd 8
 will not send any MLD packets on the interface.
 This option is usually meaningless but will be useful when
 MLD messages are noisy (e.g. when debugging) and there is surely no
@@ -137,7 +137,7 @@ listner on the interface.
 Specifies a default preference value when sending a PIM assert message.
 Preferences are used by assert elections to determine upstream routers.
 Currently
-.Nm pim6sd
+.Xr pim6sd 8
 cannot reliably obtain preferences and metrics from the
 unicast routing protocols, so a default value may be configured.
 The default preference is 1024.
@@ -229,7 +229,7 @@ All other parameters are optional and will be set automatically.
 If an
 .Ar interface
 is specified,
-.Nm pim6sd
+.Xr pim6sd 8
 will search for a global address on the specified interface
 and set the address in Candidate RP Advertisements.
 An optional parameter
@@ -267,7 +267,7 @@ All other parameters are optional and will be set automatically.
 If an
 .Ar interface
 is specified,
-.Nm pim6sd
+.Xr pim6sd 8
 will search for a global address on the specified interface
 and set the address in Bootstrap messages.
 An optional parameter
@@ -322,14 +322,14 @@ cand_rp;
 .Xr pim6sd 8
 .Sh HISTORY
 The
-.Nm pim6sd
+.Xr pim6sd 8
 command is developed by Mickael Hoerdt at LSIIT Laboratory.
 It is based on IPv4 PIM sparse-mode
 .Nm pimd
 developed at University of Southern California,
 which has also been derived from
-.Nm mrouted.
-.Nm Mrouted
+.Nm mrouted .
+.Nm mrouted
 is COPYRIGHT 1989 by The Board of Trustees of
 Leland Stanford Junior University.
 .Pp