diff --git a/CHANGES b/CHANGES
index 064b2e8605..4b3d97f229 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+1984.	[func]		dig, nslookup and host now advertise a 4096 byte
+			EDNS UDP buffer size by default. [RT #15855]
+
 1983.	[func]		Two new update policies.  "selfsub" and "selfwild".
 			[RT #12895]
 
diff --git a/bin/dig/dighost.c b/bin/dig/dighost.c
index 3aaa106371..711428f18f 100644
--- a/bin/dig/dighost.c
+++ b/bin/dig/dighost.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dighost.c,v 1.291 2006/01/27 02:35:14 marka Exp $ */
+/* $Id: dighost.c,v 1.292 2006/02/17 00:10:42 marka Exp $ */
 
 /*! \file
  *  \note
@@ -1946,7 +1946,7 @@ setup_lookup(dig_lookup_t *lookup) {
 	check_result(result, "dns_message_renderbegin");
 	if (lookup->udpsize > 0 || lookup->dnssec || lookup->edns > -1) {
 		if (lookup->udpsize == 0)
-			lookup->udpsize = 2048;
+			lookup->udpsize = 4096;
 		if (lookup->edns < 0)
 			lookup->edns = 0;
 		add_opt(lookup->sendmsg, lookup->udpsize,