diff --git a/share/man/man5/eui64.5 b/share/man/man5/eui64.5
index 1585fd8f91f4..4e2dda6159c7 100644
--- a/share/man/man5/eui64.5
+++ b/share/man/man5/eui64.5
@@ -43,23 +43,23 @@ database contains information regarding known IEEE EUI-64s of hosts.
 The data is stored in a file called
 .Pa /etc/eui64
 in the following format:
-.Bd -unfilled -offset indent
-.Pa EUI-64 host-name
+.Bd -ragged -offset indent
+.Em EUI-64 host-name
 .Ed
 .Pp
 Items are separated by any number of blanks and/or
 tab characters.
-A 
-.Dq #
+A
+.Ql #
 at the start of a line indicates the
 beginning of a comment that extends to the end of the line.
 Valid lines may also contain comments.
-A 
-.Dq +
+A
+.Ql +
 at the start of a line will cause the
 .Xr eui64 3
 library functions to use data stored in the
-.Xr NIS 4
+NIS
 .Pa eui64.byname
 and
 .Pa eui64.byid
@@ -69,7 +69,9 @@ file.
 .Pp
 An EUI-64 is expressed in
 .Tn ASCII
-form as "x-x-x-x-x-x-x-x" where
+form as
+.Qq x-x-x-x-x-x-x-x
+where
 .Ar x
 is a hexadecimal value between 0x00 and 0xFF.
 The address values
@@ -79,18 +81,18 @@ Hostnames specified in the
 database should correspond to entries in the
 .Xr hosts 5
 file.
-./" .Pp
-./" The
-./" .Fn eui64_line
-./" function in the standard C library can be used to break individual
-./" lines in the
-./" .Pa /etc/eui64
-./" database into their individual components: a binary EUI-64 is
-./" stored as an
-./" .Pa eui64_addr
-./" structure, and a hostname stored as a character string.
+.\" .Pp
+.\" The
+.\" .Fn eui64_line
+.\" function in the standard C library can be used to break individual
+.\" lines in the
+.\" .Pa /etc/eui64
+.\" database into their individual components: a binary EUI-64 is
+.\" stored as an
+.\" .Pa eui64_addr
+.\" structure, and a hostname stored as a character string.
 .Sh FILES
-.Bl -tag -width /etc/eui64 -compact
+.Bl -tag -width ".Pa /etc/eui64" -compact
 .It Pa /etc/eui64
 The
 .Nm