diff --git a/bin/dig/include/dig/dig.h b/bin/dig/include/dig/dig.h
index 7c18b236e5..1ae42883d0 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.41 2000/08/01 01:11:19 tale Exp $ */
+/* $Id: dig.h,v 1.42 2000/08/09 00:09:27 gson Exp $ */
 
 #ifndef DIG_H
 #define DIG_H
@@ -33,12 +33,7 @@
 #include <isc/socket.h>
 
 #define MXSERV 6
-/* XXXMWS Get MXNAME from name.h, or wherever */
-#define MXNAME 1005
-/*
- * MXNAME was decided upon on 7/31/00 at IETF by everyone.
- * This may well NOT be true for bitstring labels.
- */
+#define MXNAME (DNS_NAME_MAXTEXT+1)
 #define MXRD 32
 #define BUFSIZE 512
 #define COMMSIZE 0xffff
diff --git a/bin/named/query.c b/bin/named/query.c
index de5cbbc5a2..3856e64ed9 100644
--- a/bin/named/query.c
+++ b/bin/named/query.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: query.c,v 1.124 2000/08/08 23:57:13 gson Exp $ */
+/* $Id: query.c,v 1.125 2000/08/09 00:09:29 gson Exp $ */
 
 #include <config.h>
 
@@ -2905,7 +2905,7 @@ query_find(ns_client_t *client, dns_fetchevent_t *event) {
 static inline void
 log_query(ns_client_t *client) {
 	isc_buffer_t b;
-	char namebuf[1024];
+	char namebuf[DNS_NAME_FORMATSIZE];
 	char text[256];
 	isc_region_t r;
 	dns_rdataset_t *rdataset;
diff --git a/bin/named/xfrout.c b/bin/named/xfrout.c
index d8a663d796..ad2002a0f4 100644
--- a/bin/named/xfrout.c
+++ b/bin/named/xfrout.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: xfrout.c,v 1.71 2000/08/07 20:39:10 gson Exp $ */
+/* $Id: xfrout.c,v 1.72 2000/08/09 00:09:30 gson Exp $ */
 
 #include <config.h>
 
@@ -1512,7 +1512,7 @@ xfrout_logv(ns_client_t *client, dns_name_t *zonename, int level,
 	    const char *fmt, va_list ap)
 {
 	char msgbuf[2048];
-	char namebuf[1024];
+	char namebuf[DNS_NAME_FORMATSIZE];
 
 	dns_name_format(zonename, namebuf, sizeof(namebuf));
 	vsnprintf(msgbuf, sizeof(msgbuf), fmt, ap);
diff --git a/bin/nsupdate/nsupdate.c b/bin/nsupdate/nsupdate.c
index 31722f3785..ca23309533 100644
--- a/bin/nsupdate/nsupdate.c
+++ b/bin/nsupdate/nsupdate.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: nsupdate.c,v 1.40 2000/08/02 02:34:40 bwelling Exp $ */
+/* $Id: nsupdate.c,v 1.41 2000/08/09 00:09:31 gson Exp $ */
 
 #include <config.h>
 
@@ -63,7 +63,6 @@
 #include <unistd.h>
 
 #define MXNAME 256
-#define MAXPNAME 1025
 #define MAXCMD 1024
 #define NAMEBUF 512
 #define WORDLEN 512
@@ -1191,7 +1190,7 @@ recvsoa(isc_task_t *task, isc_event_t *event) {
 	}
 
 	if (debugging) {
-		char namestr[MAXPNAME];
+		char namestr[DNS_NAME_FORMATSIZE];
 		dns_name_format(name, namestr, sizeof(namestr));
 		fprintf(stderr, "Found zone name: %s\n", namestr);
 	}
@@ -1213,7 +1212,7 @@ recvsoa(isc_task_t *task, isc_event_t *event) {
 		zonename = name;
 
 	if (debugging) {
-		char namestr[MAXPNAME];
+		char namestr[DNS_NAME_FORMATSIZE];
 		dns_name_format(&master, namestr, sizeof(namestr));
 		fprintf(stderr, "The master is: %s\n", namestr);
 	}
diff --git a/bin/tests/byaddr_test.c b/bin/tests/byaddr_test.c
index 6094a4328f..a455523607 100644
--- a/bin/tests/byaddr_test.c
+++ b/bin/tests/byaddr_test.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: byaddr_test.c,v 1.19 2000/08/01 01:12:37 tale Exp $ */
+/* $Id: byaddr_test.c,v 1.20 2000/08/09 00:09:32 gson Exp $ */
 
 /*
  * Principal Author: Bob Halley
@@ -59,7 +59,7 @@ done(isc_task_t *task, isc_event_t *event) {
 		for (name = ISC_LIST_HEAD(bevent->names);
 		     name != NULL;
 		     name = ISC_LIST_NEXT(name, link)) {
-			char text[1024];
+			char text[DNS_NAME_FORMATSIZE];
 			dns_name_format(name, text, sizeof(text));
 			printf("%s\n", text);
 		}
diff --git a/bin/tests/byname_test.c b/bin/tests/byname_test.c
index 1e9130b989..906357d904 100644
--- a/bin/tests/byname_test.c
+++ b/bin/tests/byname_test.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: byname_test.c,v 1.21 2000/08/01 01:12:38 tale Exp $ */
+/* $Id: byname_test.c,v 1.22 2000/08/09 00:09:34 gson Exp $ */
 
 /*
  * Principal Author: Bob Halley
@@ -101,7 +101,7 @@ print_addresses(dns_adbfind_t *find) {
 
 static void
 print_name(dns_name_t *name) {
-	char text[1024];
+	char text[DNS_NAME_FORMATSIZE];
 
 	dns_name_format(name, text, sizeof(text));
 	printf("%s\n", text);
diff --git a/lib/dns/adb.c b/lib/dns/adb.c
index 93bdd29ca6..ecd5415892 100644
--- a/lib/dns/adb.c
+++ b/lib/dns/adb.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: adb.c,v 1.144 2000/08/01 01:22:09 tale Exp $ */
+/* $Id: adb.c,v 1.145 2000/08/09 00:09:35 gson Exp $ */
 
 /*
  * Implementation notes
@@ -2994,7 +2994,7 @@ dns_adb_dumpfind(dns_adbfind_t *find, FILE *f) {
 
 static void
 print_dns_name(FILE *f, dns_name_t *name) {
-	char buf[1024];
+	char buf[DNS_NAME_FORMATSIZE];
 
 	INSIST(f != NULL);
 
diff --git a/lib/dns/xfrin.c b/lib/dns/xfrin.c
index 1e574dc632..b759c9defa 100644
--- a/lib/dns/xfrin.c
+++ b/lib/dns/xfrin.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: xfrin.c,v 1.90 2000/08/08 23:49:28 gson Exp $ */
+/* $Id: xfrin.c,v 1.91 2000/08/09 00:09:36 gson Exp $ */
 
 #include <config.h>
 
@@ -1217,8 +1217,8 @@ static void
 xfrin_logv(int level, dns_name_t *zonename, isc_sockaddr_t *masteraddr,
 	   const char *fmt, va_list ap)
 {
-	char zntext[1024];
-	char mastertext[256];
+	char zntext[DNS_NAME_FORMATSIZE];
+	char mastertext[ISC_SOCKADDR_FORMATSIZE];
 	char msgtext[2048];
 
 	dns_name_format(zonename, zntext, sizeof(zntext));