diff --git a/src/usr.sbin/ntpd/ntpctl.8 b/src/usr.sbin/ntpd/ntpctl.8
index 84febad1..75d3cc83 100644
--- a/src/usr.sbin/ntpd/ntpctl.8
+++ b/src/usr.sbin/ntpd/ntpctl.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ntpctl.8,v 1.2 2013/10/04 20:30:38 schwarze Exp $
+.\" $OpenBSD: ntpctl.8,v 1.3 2013/10/06 16:52:31 jmc Exp $
 .\"
 .\" Copyright (c) 2012 Mike Miller <mmiller@mgm51.com>
 .\"
@@ -14,17 +14,15 @@
 .\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
 .\" OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: October 4 2013 $
+.Dd $Mdocdate: October 6 2013 $
 .Dt NTPCTL 8
 .Os
 .Sh NAME
 .Nm ntpctl
-.Nd "control program for the Network Time Protocol daemon"
+.Nd control the Network Time Protocol daemon
 .Sh SYNOPSIS
 .Nm ntpctl
-.Bk -words
 .Op Fl s Ar modifier
-.Ek
 .Sh DESCRIPTION
 The
 .Nm
@@ -37,35 +35,32 @@ The options are as follows:
 .It Fl s Ar modifier
 Show the data specified by
 .Ar modifier :
-.Bl -tag -width XXXXXXXXXX -compact
-.Pp
-.It Fl s Cm status
-Show the status of peers and sensors, and whether the system clock is
-synced.  When the system clock is synced, the stratum is displayed.
-When the system clock is not synced, the offset of the system clock,
-as reported by the
-.Xr adjtime 2
-system call, is displayed.
-.Pp
+.Bl -tag -width "sensorsXXX"
+.It Fl s Cm all
+Show all data.
 .It Fl s Cm peers
 Show the following information about each peer: weight, trustlevel,
 stratum, number of seconds until the next poll, polling interval
-in seconds, and offset, network delay and network jitter in
-milliseconds.  When the system clock is synced to a peer, an asterisk
+in seconds, and offset, network delay and network jitter in milliseconds.
+When the system clock is synced to a peer, an asterisk
 is displayed to the left of the weight column for that peer.
-.Pp
 .It Fl s Cm sensors
 Show the following information about each sensor: weight, sensor "good"
 status, stratum, and offset and the configured correction in
 milliseconds.
 When the system clock is synced to a sensor, an asterisk
 is displayed to the left of the weight column for that sensor.
-.Pp
-.It Fl s Cm all
-Show all of the above.
+.It Fl s Cm status
+Show the status of peers and sensors, and whether the system clock is synced.
+When the system clock is synced, the stratum is displayed.
+When the system clock is not synced, the offset of the system clock,
+as reported by the
+.Xr adjtime 2
+system call, is displayed.
+.El
 .El
 .Sh FILES
-.Bl -tag -width "/var/db/ntpd.driftXXX" -compact
+.Bl -tag -width "/var/run/ntpd.sockXXX" -compact
 .It Pa /var/run/ntpd.sock
 Socket file for communication with
 .Xr ntpd 8 .