diff --git a/CHANGES b/CHANGES
index 65728fc604..5a835f029a 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+1668.	[bug]		DIG_SIGCHASE was making bin/dig/host dump core.
+
 1667.	[port]		linux: not all versions have IF_NAMESIZE.
 
 1666.	[bug]		The optional port on hostnames in dual-stack-servers
diff --git a/bin/dig/dig.c b/bin/dig/dig.c
index f91a288953..d8756c8817 100644
--- a/bin/dig/dig.c
+++ b/bin/dig/dig.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dig.c,v 1.157.2.13.2.18 2004/06/07 03:56:25 marka Exp $ */
+/* $Id: dig.c,v 1.157.2.13.2.19 2004/06/19 02:30:10 sra Exp $ */
 
 #include <config.h>
 #include <stdlib.h>
@@ -41,15 +41,6 @@
 #include <dns/rdataclass.h>
 #include <dns/result.h>
 
-#ifdef DIG_SIGCHASE
-#ifndef DIG_SIGCHASE_BU
-#define DIG_SIGCHASE_BU 1
-#endif
-#ifndef DIG_SIGCHASE_TD
-#define DIG_SIGCHASE_TD 1
-#endif
-#endif
-
 #include <dig/dig.h>
 
 extern ISC_LIST(dig_lookup_t) lookup_list;
diff --git a/bin/dig/dighost.c b/bin/dig/dighost.c
index ad1fa3727d..1d527a8ccb 100644
--- a/bin/dig/dighost.c
+++ b/bin/dig/dighost.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dighost.c,v 1.221.2.19.2.12 2004/06/11 00:30:50 marka Exp $ */
+/* $Id: dighost.c,v 1.221.2.19.2.13 2004/06/19 02:30:11 sra Exp $ */
 
 /*
  * Notice to programmers:  Do not use this code as an example of how to
@@ -32,15 +32,6 @@
 #include <string.h>
 #include <limits.h>
 
-#ifdef DIG_SIGCHASE
-#ifndef DIG_SIGCHASE_BU
-#define DIG_SIGCHASE_BU 1
-#endif
-#ifndef DIG_SIGCHASE_TD
-#define DIG_SIGCHASE_TD 1
-#endif
-#endif 
-
 #include <dns/byaddr.h>
 #ifdef DIG_SIGCHASE
 #include <dns/dnssec.h>
@@ -2864,7 +2855,8 @@ recv_done(isc_task_t *task, isc_event_t *event) {
 				fatal("Memory allocation failure in %s:%d",
 				      __FILE__, __LINE__);
 			}
-			ISC_LIST_APPEND(chase_message_list, chase_msg, link);
+			ISC_LIST_INITANDAPPEND(chase_message_list, chase_msg,
+					       link);
 			if (dns_message_create(mctx, DNS_MESSAGE_INTENTPARSE,
 					       &msg_temp) != ISC_R_SUCCESS) {
 				fatal("dns_message_create in %s:%d",
@@ -2889,7 +2881,8 @@ recv_done(isc_task_t *task, isc_event_t *event) {
 				fatal("Memory allocation failure in %s:%d",
 				      __FILE__, __LINE__);
 			}
-			ISC_LIST_APPEND(chase_message_list2, chase_msg2, link);
+			ISC_LIST_INITANDAPPEND(chase_message_list2, chase_msg2,
+					       link);
 			chase_msg2->msg = msg;
 		}
 #endif
diff --git a/bin/dig/include/dig/dig.h b/bin/dig/include/dig/dig.h
index 15562af422..12e1e21dfd 100644
--- a/bin/dig/include/dig/dig.h
+++ b/bin/dig/include/dig/dig.h
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dig.h,v 1.71.2.6.2.5 2004/04/13 03:00:07 marka Exp $ */
+/* $Id: dig.h,v 1.71.2.6.2.6 2004/06/19 02:30:12 sra Exp $ */
 
 #ifndef DIG_H
 #define DIG_H
@@ -74,6 +74,19 @@
  * be 1.
  */
 
+/*
+ * Defaults for the sigchase suboptions.  Consolidated here because
+ * these control the layout of dig_lookup_t (among other things).
+ */
+#ifdef DIG_SIGCHASE
+#ifndef DIG_SIGCHASE_BU
+#define DIG_SIGCHASE_BU 1
+#endif
+#ifndef DIG_SIGCHASE_TD
+#define DIG_SIGCHASE_TD 1
+#endif
+#endif
+
 ISC_LANG_BEGINDECLS
 
 typedef struct dig_lookup dig_lookup_t;
diff --git a/bin/dig/nslookup.c b/bin/dig/nslookup.c
index 923ab8482c..f4949201c5 100644
--- a/bin/dig/nslookup.c
+++ b/bin/dig/nslookup.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: nslookup.c,v 1.90.2.4.2.5 2004/06/07 03:56:25 marka Exp $ */
+/* $Id: nslookup.c,v 1.90.2.4.2.6 2004/06/19 02:30:12 sra Exp $ */
 
 #include <config.h>
 
@@ -42,15 +42,6 @@
 #include <dns/rdatatype.h>
 #include <dns/byaddr.h>
 
-#ifdef DIG_SIGCHASE
-#ifndef DIG_SIGCHASE_BU
-#define DIG_SIGCHASE_BU 1
-#endif
-#ifndef DIG_SIGCHASE_TD
-#define DIG_SIGCHASE_TD 1
-#endif
-#endif
-
 #include <dig/dig.h>
 
 extern ISC_LIST(dig_lookup_t) lookup_list;