diff --git a/CHANGES b/CHANGES
index 0b7a1313d5..a743b9ecaf 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+1904.	[bug]		A escaped character is, potentially, converted to
+			the output character set too early. [RT #14666]
+
 1903.	[doc]		Review ARM for BIND 9.4.
 
 1902.	[port]		Use uintptr_t if available. [RT #14606]
diff --git a/lib/dns/name.c b/lib/dns/name.c
index 7566a940e2..b9f399972f 100644
--- a/lib/dns/name.c
+++ b/lib/dns/name.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: name.c,v 1.150 2005/04/27 04:56:48 sra Exp $ */
+/* $Id: name.c,v 1.151 2005/07/20 01:46:49 marka Exp $ */
 
 /*! \file */
 
@@ -1371,13 +1371,14 @@ dns_name_totext(dns_name_t *name, isc_boolean_t omit_final_dot,
 						trem--;
 						nlen--;
 					} else {
-						char buf[5];
 						if (trem < 4)
 							return (ISC_R_NOSPACE);
-						snprintf(buf, sizeof(buf),
-							 "\\%03u", c);
-						memcpy(tdata, buf, 4);
-						tdata += 4;
+						*tdata++ = 0x5c;
+						*tdata++ = 0x30 +
+							   ((c / 100) % 10);
+						*tdata++ = 0x30 +
+							   ((c / 10) % 10);
+						*tdata++ = 0x30 + (c % 10);
 						trem -= 4;
 						ndata++;
 						nlen--;
diff --git a/lib/dns/rdata.c b/lib/dns/rdata.c
index 08f3c46f87..3d00cf8ed3 100644
--- a/lib/dns/rdata.c
+++ b/lib/dns/rdata.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: rdata.c,v 1.189 2005/05/19 04:59:03 marka Exp $ */
+/* $Id: rdata.c,v 1.190 2005/07/20 01:46:49 marka Exp $ */
 
 /*! \file */
 
@@ -992,11 +992,14 @@ txt_totext(isc_region_t *source, isc_buffer_t *target) {
 		if (*sp < 0x20 || *sp >= 0x7f) {
 			if (tl < 4)
 				return (ISC_R_NOSPACE);
-			snprintf(tp, 5, "\\%03u", *sp++);
-			tp += 4;
+			*tp++ = 0x5c;
+			*tp++ = 0x30 + ((*sp / 100) % 10);
+			*tp++ = 0x30 + ((*sp / 10) % 10);
+			*tp++ = 0x30 + (*sp % 10);
 			tl -= 4;
 			continue;
 		}
+		/* double quote, semi-colon, backslash */
 		if (*sp == 0x22 || *sp == 0x3b || *sp == 0x5c) {
 			if (tl < 2)
 				return (ISC_R_NOSPACE);