diff --git a/bin/dig/dig.c b/bin/dig/dig.c
index 53819adde3..5e9203a2db 100644
--- a/bin/dig/dig.c
+++ b/bin/dig/dig.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dig.c,v 1.104 2000/09/27 00:01:58 mws Exp $ */
+/* $Id: dig.c,v 1.105 2000/09/28 23:02:25 mws Exp $ */
 
 #include <config.h>
 #include <stdlib.h>
@@ -160,7 +160,7 @@ show_usage(void) {
 "                 +[no]recursive      (Recursive mode)\n"
 "                 +[no]ignore         (Don't revert to TCP for TC responses.)"
 "\n"
-"                 +[no]fail           (Try next server on SERVFAIL reply)\n"
+"                 +[no]fail           (Don't try next server on SERVFAIL)\n"
 "                 +[no]aaonly         (Set AA flag in query)\n"
 "                 +[no]adflag         (Set AD flag in query)\n"
 "                 +[no]cdflag         (Set CD flag in query)\n"
@@ -662,7 +662,7 @@ plus_option(char *option, isc_boolean_t is_batchfile,
 		}
 		break;
 	case 'f': /* fail */
-		lookup->next_on_fail = state;
+		lookup->servfail_stops = state;
 		break;
 	case 'i':
 		switch (tolower(cmd[1])) {
diff --git a/bin/dig/dighost.c b/bin/dig/dighost.c
index a219a041d8..6af4dd0f0a 100644
--- a/bin/dig/dighost.c
+++ b/bin/dig/dighost.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dighost.c,v 1.136 2000/09/27 00:02:00 mws Exp $ */
+/* $Id: dighost.c,v 1.137 2000/09/28 23:02:26 mws Exp $ */
 
 /*
  * Notice to programmers:  Do not use this code as an example of how to
@@ -295,7 +295,7 @@ make_empty_lookup(void) {
 	looknew->trace_root = ISC_FALSE;
 	looknew->identify = ISC_FALSE;
 	looknew->ignore = ISC_FALSE;
-	looknew->next_on_fail = ISC_FALSE;
+	looknew->servfail_stops = ISC_FALSE;
 	looknew->udpsize = 0;
 	looknew->recurse = ISC_TRUE;
 	looknew->aaonly = ISC_FALSE;
@@ -347,7 +347,7 @@ clone_lookup(dig_lookup_t *lookold, isc_boolean_t servers) {
 	looknew->trace_root = lookold->trace_root;
 	looknew->identify = lookold->identify;
 	looknew->ignore = lookold->ignore;
-	looknew->next_on_fail = lookold->next_on_fail;
+	looknew->servfail_stops = lookold->servfail_stops;
 	looknew->udpsize = lookold->udpsize;
 	looknew->recurse = lookold->recurse;
         looknew->aaonly = lookold->aaonly;
@@ -2177,7 +2177,7 @@ recv_done(isc_task_t *task, isc_event_t *event) {
 			return;
 		}			
 		if ((msg->rcode == dns_rcode_servfail) &&
-		    l->next_on_fail) {
+		    l->servfail_stops) {
 			dig_query_t *next = ISC_LIST_NEXT(query, link);
 			if (l->current_query == query)
 				l->current_query = NULL;
diff --git a/bin/dig/include/dig/dig.h b/bin/dig/include/dig/dig.h
index cb9ed082e9..aca77ddb9c 100644
--- a/bin/dig/include/dig/dig.h
+++ b/bin/dig/include/dig/dig.h
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dig.h,v 1.49 2000/09/25 23:09:59 mws Exp $ */
+/* $Id: dig.h,v 1.50 2000/09/28 23:02:28 mws Exp $ */
 
 #ifndef DIG_H
 #define DIG_H
@@ -94,7 +94,7 @@ struct dig_lookup {
 		section_answer,
 		section_authority,
 		section_additional,
-		next_on_fail,
+		servfail_stops,
 		new_search;
 	char textname[MXNAME]; /* Name we're going to be looking up */
 	dns_rdatatype_t rdtype;