2 files changed, 10 insertions, 2 deletions

diff --git a/usr.bin/whois/whois.1 b/usr.bin/whois/whois.1
index 18a63834bfed..28efda159057 100644
--- a/usr.bin/whois/whois.1
+++ b/usr.bin/whois/whois.1
@@ -40,7 +40,7 @@
 .Nd "Internet domain name and network number directory service"
 .Sh SYNOPSIS
 .Nm
-.Op Fl aAdgiIlmQrR6
+.Op Fl aAbdgiIlmQrR6
 .Op Fl c Ar country-code | Fl h Ar host
 .Op Fl p Ar port
 .Ar name ...
@@ -73,6 +73,10 @@ Use the Asia/Pacific Network Information Center
 database.
 It contains network numbers used in East Asia, Australia,
 New Zealand, and the Pacific islands.
+.It Fl b
+Use the Network Abuse Clearinghouse database.
+It contains addresses to which network abuse should be reported,
+indexed by domain name.
 .It Fl c Ar country-code
 This is the equivalent of using the
 .Fl h
diff --git a/usr.bin/whois/whois.c b/usr.bin/whois/whois.c
index 54ee7d065515..ad488e5a405d 100644
--- a/usr.bin/whois/whois.c
+++ b/usr.bin/whois/whois.c
@@ -60,6 +60,7 @@ __FBSDID("$FreeBSD$");
 #include <sysexits.h>
 #include <unistd.h>
 
+#define	ABUSEHOST	"whois.abuse.net"
 #define	NICHOST		"whois.crsnic.net"
 #define	INICHOST	"whois.networksolutions.com"
 #define	DNICHOST	"whois.nic.mil"
@@ -105,7 +106,7 @@ main(int argc, char *argv[])
 
 	country = host = qnichost = NULL;
 	flags = use_qnichost = 0;
-	while ((ch = getopt(argc, argv, "aAc:dgh:iIlmp:QrR6")) != -1) {
+	while ((ch = getopt(argc, argv, "aAbc:dgh:iIlmp:QrR6")) != -1) {
 		switch (ch) {
 		case 'a':
 			host = ANICHOST;
@@ -113,6 +114,9 @@ main(int argc, char *argv[])
 		case 'A':
 			host = PNICHOST;
 			break;
+		case 'b':
+			host = ABUSEHOST;
+			break;
 		case 'c':
 			country = optarg;
 			break;