diff --git a/sbin/ping6/ping6.8 b/sbin/ping6/ping6.8
index 5703be3e4241..f68ec8f34b21 100644
--- a/sbin/ping6/ping6.8
+++ b/sbin/ping6/ping6.8
@@ -25,8 +25,8 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     $NetBSD: ping6.8,v 1.5 2000/01/31 14:24:24 itojun Exp $
-.\"     KAME Id: ping6.8,v 1.11 1999/12/23 17:39:45 itojun Exp
+.\"     $NetBSD: ping6.8,v 1.6 2000/02/28 13:50:04 itojun Exp $
+.\"     KAME Id: ping6.8,v 1.13 2000/02/28 13:33:19 itojun Exp
 .\"
 .Dd May 17, 1998
 .Dt PING6 8
@@ -81,17 +81,19 @@ Generate ICMPv6 Node Information Node Addresses query, rather than echo-request.
 must be a string constructed of the following charaters.
 .Bl -tag -width Ds -compact
 .It Ic a
-requires all the responder's unicast addresses. If the charater is ommited,
+requests all the responder's unicast addresses. If the charater is ommited,
 only those addresses which belong to the interface which has the
-responder's address are required.
+responder's address are requests.
+.It Ic c
+requests responder's IPv4-compatible and IPv4-mapped addresses.
 .It Ic g
-requires responder's global-scope addresses.
+requests responder's global-scope addresses.
 .It Ic s
-requires responder's site-local addresses.
+requests responder's site-local addresses.
 .It Ic l
-requires responder's link-local addresses.
+requests responder's link-local addresses.
 .It Ic A
-requires responder's anycast addresses. Without this character, the responder
+requests responder's anycast addresses. Without this character, the responder
 will return unicast addresses only. With this character, the responder
 will return anycast addresses only.
 Note that the specification does not specify how to get responder's
diff --git a/sbin/ping6/ping6.c b/sbin/ping6/ping6.c
index 130751d8f2b8..f024f7f3fc1b 100644
--- a/sbin/ping6/ping6.c
+++ b/sbin/ping6/ping6.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ping6.c,v 1.12 2000/02/16 00:37:02 itojun Exp $	*/
+/*	$NetBSD: ping6.c,v 1.13 2000/02/28 13:50:04 itojun Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -80,7 +80,7 @@ static char sccsid[] = "@(#)ping.c	8.1 (Berkeley) 6/5/93";
 #else
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: ping6.c,v 1.12 2000/02/16 00:37:02 itojun Exp $");
+__RCSID("$NetBSD: ping6.c,v 1.13 2000/02/28 13:50:04 itojun Exp $");
 #endif
 #endif
 
@@ -306,6 +306,10 @@ main(argc, argv)
 				 case 'a':
 					 naflags |= NI_NODEADDR_FLAG_ALL;
 					 break;
+				 case 'c':
+				 case 'C':
+					 naflags |= NI_NODEADDR_FLAG_COMPAT;
+					 break;
 				 case 'l':
 				 case 'L':
 					 naflags |= NI_NODEADDR_FLAG_LINKLOCAL;
@@ -1811,8 +1815,8 @@ usage()
 		      "AE"
 #endif
 #endif		      
-		      "] [-a [alsg]] [-b sockbufsiz] [-c count] [-I interface]\n\
-             [-i wait] [-l preload] [-p pattern] [-S sourceaddr]\n\
+		      "] [-a [aAclsg]] [-b sockbufsiz] [-c count] \n\
+             [-I interface] [-i wait] [-l preload] [-p pattern] [-S sourceaddr]\n\
              [-s packetsize] [-h hoplimit] [hops...] host\n");
 	exit(1);
 }