diff --git a/usr.bin/mkcsmapper/mkcsmapper.1 b/usr.bin/mkcsmapper/mkcsmapper.1
index 34bbd15fb245..a381633314fb 100644
--- a/usr.bin/mkcsmapper/mkcsmapper.1
+++ b/usr.bin/mkcsmapper/mkcsmapper.1
@@ -1,4 +1,4 @@
-.\" $NetBSD: mkcsmapper.1,v 1.2 2016/06/28 09:20:30 wiz Exp $
+.\" $NetBSD: mkcsmapper.1,v 1.3 2016/06/28 09:22:16 wiz Exp $
 .\"
 .\" Copyright (c) 2009 Gabor Kovesdan <gabor@FreeBSD.org>
 .\" All rights reserved.
@@ -45,8 +45,9 @@
 .Xr iconv 3
 .Sh SYNOPSIS
 .Nm
-.Op Fl dmp
-.Fl o Ar outfile
+.Op Fl d
+.Op Fl m | Fl p
+.Op Fl o Ar outfile
 .Ar infile
 .Sh DESCRIPTION
 The
@@ -61,7 +62,7 @@ A pivot file, which the possible source and destination encoding
 pairs or the set of mappings to use for a compound encoding.
 .Pp
 The following options are available:
-.Bl -tag -width 0123
+.Bl -tag -width XoXoutfileXX
 .It Fl d
 Turns on debug mode.
 .It Fl m
diff --git a/usr.bin/mkcsmapper/yacc.y b/usr.bin/mkcsmapper/yacc.y
index 4a95198d9c35..0ea1640ca2c0 100644
--- a/usr.bin/mkcsmapper/yacc.y
+++ b/usr.bin/mkcsmapper/yacc.y
@@ -1,4 +1,4 @@
-/*	$NetBSD: yacc.y,v 1.10 2015/06/16 22:54:10 christos Exp $	*/
+/*	$NetBSD: yacc.y,v 1.11 2016/06/28 09:22:16 wiz Exp $	*/
 
 %{
 /*-
@@ -33,7 +33,7 @@
 
 #include <sys/cdefs.h>
 #if !defined(lint)
-__RCSID("$NetBSD: yacc.y,v 1.10 2015/06/16 22:54:10 christos Exp $");
+__RCSID("$NetBSD: yacc.y,v 1.11 2016/06/28 09:22:16 wiz Exp $");
 #endif /* not lint */
 
 #include <assert.h>
@@ -673,7 +673,7 @@ do_mkpv(FILE *in)
 __dead static void
 usage(void)
 {
-	fprintf(stderr, "Usage: %s [-m|-p] [-d] [-o outfile] [infile]\n",
+	fprintf(stderr, "Usage: %s [-d] [-m|-p] [-o outfile] [infile]\n",
 	    getprogname());
 	exit(EXIT_FAILURE);
 }