diff --git a/telnet/telnet.1 b/telnet/telnet.1
index 3958f20..61a0232 100644
--- a/telnet/telnet.1
+++ b/telnet/telnet.1
@@ -1259,10 +1259,12 @@ has ever been enabled, then
 is sent as
 .Ic abort  ,
 and
-.Ic eof and
-.B suspend
+.Ic eof
+and
+.Ic suspend
 are sent as
-.Ic eof and
+.Ic eof
+and
 .Ic susp ,
 see
 .Ic send
diff --git a/telnetd/telnetd.8 b/telnetd/telnetd.8
index 38c791e..0109156 100644
--- a/telnetd/telnetd.8
+++ b/telnetd/telnetd.8
@@ -69,7 +69,7 @@ for requests to connect to the
 port as indicated by the
 .Pa /etc/services
 file (see
-.Xr services 5 ).
+.Xr services 5 ) .
 The
 .Fl debug
 option may be used to start up
@@ -380,7 +380,9 @@ DO TIMING-MARK
 .Ed
 .Pp
 The pseudo-terminal allocated to the client is configured
-to operate in \*(lqcooked\*(rq mode, and with
+to operate in
+.Dq cooked
+mode, and with
 .Dv XTABS and
 .Dv CRMOD
 enabled (see
@@ -524,6 +526,7 @@ Only sent if
 is compiled with support for data encryption, and
 indicates a willingness to decrypt
 the data stream.
+.El
 .Sh ENVIRONMENT
 .Sh FILES
 .Bl -tag -width /usr/ucb/bftp -compact
@@ -585,6 +588,7 @@ Telnet Authentication: SPX
 Telnet Environment Option Interoperability Issues
 .It Cm RFC-1572
 Telnet Environment Option
+.El
 .Sh BUGS
 Some
 .Tn TELNET