diff --git a/share/man/man5/hesiod.conf.5 b/share/man/man5/hesiod.conf.5
index 639b44769443..a81b00fb02c7 100644
--- a/share/man/man5/hesiod.conf.5
+++ b/share/man/man5/hesiod.conf.5
@@ -17,37 +17,63 @@
 .\" this software for any purpose.  It is provided "as is"
 .\" without express or implied warranty.
 .\"
-.TH HESIOD.CONF 5 "30 November 1996"
-.SH NAME
-hesiod.conf \- Configuration file for the Hesiod library
-.SH DESCRIPTION
-The file hesiod.conf determines the behavior of the Hesiod library.
-Blank lines and lines beginning with a `#' character are ignored.  All
+.Dd November 30, 1996
+.Dt HESIOD.CONF 5
+.Os
+.Sh NAME
+.Nm hesiod.conf
+.Nd "configuration file for the Hesiod library"
+.Sh DESCRIPTION
+The file
+.Nm
+determines the behavior of the Hesiod library.
+Blank lines and lines beginning with a
+.Ql #
+character are ignored.
+All
 other lines should be of the form
-.I variable
+.Ar variable
 =
-.IR value ,
-where the value should be a single word.  Possible variables and
-values are:
-.IP lhs
-Specifies the domain prefix used for Hesiod queries.  In almost all
-cases, you should specify ``lhs=.ns''.  The default value if you do
+.Ar value ,
+where the
+.Ar value
+should be a single word.
+Possible
+.Ar variables
+and
+.Ar values
+are:
+.Bl -tag -width classes
+.It Ic lhs
+Specifies the domain prefix used for Hesiod queries.
+In almost all cases, you should specify
+.Dq Li lhs=.ns .
+The default value if you do
 not specify an lhs value is no domain prefix, which is not compatible
 with most Hesiod domains.
-.IP rhs
+.It Ic rhs
 Specifies the default Hesiod domain; this value may be overridden by
 the
-.B HES_DOMAIN
-environment variable.  You must specify an rhs line for the Hesiod
+.Ev HES_DOMAIN
+environment variable.
+You must specify an rhs line for the Hesiod
 library to work properly.
-.IP classes
-Specifies which DNS classes Hesiod should do lookups in.  Possible
-values are IN (the preferred class) and HS (the deprecated class,
-still used by some sites).  You may specify both classes separated by
+.It Ic classes
+Specifies which DNS classes Hesiod should do lookups in.
+Possible values are
+.Cm IN
+(the preferred class) and
+.Cm HS
+(the deprecated class, still used by some sites).
+You may specify both classes separated by
 a comma to try one class first and then the other if no entry is
-available in the first class.  The default value of the classes
-variable is ``IN,HS''.
-.SH SEE ALSO
-hesiod(3)
-.SH BUGS
-The default value for ``lhs'' should probably be more reasonable.
+available in the first class.
+The default value of the classes variable is
+.Dq Li IN,HS .
+.El
+.Sh SEE ALSO
+.Xr hesiod 3
+.Sh BUGS
+The default value for
+.Ic lhs
+should probably be more reasonable.