diff --git a/libexec/tftpd/tftpd.8 b/libexec/tftpd/tftpd.8
index a2c9fc9e238d..4480f109af44 100644
--- a/libexec/tftpd/tftpd.8
+++ b/libexec/tftpd/tftpd.8
@@ -1,4 +1,4 @@
-.\"	$NetBSD: tftpd.8,v 1.23 2010/01/08 23:25:07 wiz Exp $
+.\"	$NetBSD: tftpd.8,v 1.24 2010/01/08 23:27:08 wiz Exp $
 .\"
 .\" Copyright (c) 1983, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -41,7 +41,7 @@ Internet Trivial File Transfer Protocol server
 .Nm
 .Op Fl dln
 .Op Fl g Ar group
-.Op Fl p Ar path separator
+.Op Fl p Ar pathsep
 .Op Fl s Ar directory
 .Op Fl u Ar user
 .Op Ar directory ...
@@ -91,7 +91,7 @@ The given directories are also treated as a search path for
 relative filename requests.
 .Pp
 The options are:
-.Bl -tag -width "directory"
+.Bl -tag -width "XsXdirectoryX"
 .It Fl d
 Enable verbose debugging messages to
 .Xr syslogd 8 .
@@ -109,10 +109,10 @@ Logs all requests using
 .It Fl n
 Suppresses negative acknowledgement of requests for nonexistent
 relative filenames.
-.It Fl p Ar path separator
+.It Fl p Ar pathsep
 All occurances of the single character
-.Ar path separator
-in the requested filename are replaced with
+.Ar pathsep
+(path separator) in the requested filename are replaced with
 .Sq / .
 .It Fl s Ar directory
 .Nm
diff --git a/libexec/tftpd/tftpd.c b/libexec/tftpd/tftpd.c
index b500c8e6bf3e..b62a958f372b 100644
--- a/libexec/tftpd/tftpd.c
+++ b/libexec/tftpd/tftpd.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: tftpd.c,v 1.33 2010/01/08 21:05:14 christos Exp $	*/
+/*	$NetBSD: tftpd.c,v 1.34 2010/01/08 23:27:08 wiz Exp $	*/
 
 /*
  * Copyright (c) 1983, 1993
@@ -36,7 +36,7 @@ __COPYRIGHT("@(#) Copyright (c) 1983, 1993\
 #if 0
 static char sccsid[] = "@(#)tftpd.c	8.1 (Berkeley) 6/4/93";
 #else
-__RCSID("$NetBSD: tftpd.c,v 1.33 2010/01/08 21:05:14 christos Exp $");
+__RCSID("$NetBSD: tftpd.c,v 1.34 2010/01/08 23:27:08 wiz Exp $");
 #endif
 #endif /* not lint */
 
@@ -141,7 +141,7 @@ usage(void)
 {
 
 	syslog(LOG_ERR,
-    "Usage: %s [-dln] [-u user] [-g group] [-s directory] [-p pathsep] [directory ...]",
+    "Usage: %s [-dln] [-g group] [-p pathsep] [-s directory] [-u user] [directory ...]",
 		    getprogname());
 	exit(1);
 }