diff --git a/CHANGES b/CHANGES
index 4bd93530ca..6223c4fe9c 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+ 682.	[bug]		nslookup diplayed SOA records incorrectly. [RT #665]
+
  681.	[bug]		$GENERATE specifying output format was broken. [RT#653]
 
  680.	[bug]		dns_rdata_fromstruct() mis-handles options bigger
diff --git a/bin/dig/nslookup.c b/bin/dig/nslookup.c
index d1f8ef1cfc..9e8b81c447 100644
--- a/bin/dig/nslookup.c
+++ b/bin/dig/nslookup.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: nslookup.c,v 1.70 2001/01/09 21:39:18 bwelling Exp $ */
+/* $Id: nslookup.c,v 1.71 2001/01/16 07:28:11 marka Exp $ */
 
 #include <config.h>
 
@@ -267,9 +267,6 @@ printsection(dig_query_t *query, dns_message_t *msg, isc_boolean_t headers,
 					printf("\tmail addr = %s\n",
 					       ptr);
 					ptr = next_token(&input, " \t\r\n");
-					if (ptr == NULL)
-						break;
-					ptr = next_token(&input, " \t\r\n");
 					if (ptr == NULL)
 						break;
 					printf("\tserial = %s\n",
@@ -431,9 +428,6 @@ detailsection(dig_query_t *query, dns_message_t *msg, isc_boolean_t headers,
 					printf("\tmail addr = %s\n",
 					       ptr);
 					ptr = next_token(&input, " \t\r\n");
-					if (ptr == NULL)
-						break;
-					ptr = next_token(&input, " \t\r\n");
 					if (ptr == NULL)
 						break;
 					printf("\tserial = %s\n",