diff --git a/CHANGES b/CHANGES
index 6422df36f9..0f4c25dcf7 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+1164.	[bug]		"Not Implemented" should be reported as NOTIMP.
+
 1165.	[bug]		We were rejecting notify-source{-v6} in zone clauses.
 
 1164.	[bug]		Empty masters clauses in slave / stub zones were not
diff --git a/bin/dig/dig.c b/bin/dig/dig.c
index 19acabc807..231fd694ce 100644
--- a/bin/dig/dig.c
+++ b/bin/dig/dig.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dig.c,v 1.175 2001/11/30 01:58:38 gson Exp $ */
+/* $Id: dig.c,v 1.176 2001/12/19 12:16:38 marka Exp $ */
 
 #include <config.h>
 #include <stdlib.h>
@@ -111,7 +111,7 @@ static const char *rcodetext[] = {
 	"FORMERR",
 	"SERVFAIL",
 	"NXDOMAIN",
-	"NOTIMPL",
+	"NOTIMP",
 	"REFUSED",
 	"YXDOMAIN",
 	"YXRRSET",
diff --git a/bin/dig/host.c b/bin/dig/host.c
index 8f9a2127a7..097f0e40f1 100644
--- a/bin/dig/host.c
+++ b/bin/dig/host.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: host.c,v 1.82 2001/11/30 01:58:40 gson Exp $ */
+/* $Id: host.c,v 1.83 2001/12/19 12:16:40 marka Exp $ */
 
 #include <config.h>
 #include <stdlib.h>
@@ -79,7 +79,7 @@ static const char *rcodetext[] = {
 	"FORMERR",
 	"SERVFAIL",
 	"NXDOMAIN",
-	"NOTIMPL",
+	"NOTIMP",
 	"REFUSED",
 	"YXDOMAIN",
 	"YXRRSET",
diff --git a/bin/dig/nslookup.c b/bin/dig/nslookup.c
index f5e4322d68..f601e810f9 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.94 2001/11/30 01:02:06 gson Exp $ */
+/* $Id: nslookup.c,v 1.95 2001/12/19 12:16:42 marka Exp $ */
 
 #include <config.h>
 
@@ -76,7 +76,7 @@ static const char *rcodetext[] = {
 	"FORMERR",
 	"SERVFAIL",
 	"NXDOMAIN",
-	"NOTIMPL",
+	"NOTIMP",
 	"REFUSED",
 	"YXDOMAIN",
 	"YXRRSET",
diff --git a/bin/tests/printmsg.c b/bin/tests/printmsg.c
index 06d491815b..7370591112 100644
--- a/bin/tests/printmsg.c
+++ b/bin/tests/printmsg.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: printmsg.c,v 1.25 2001/05/09 18:47:49 bwelling Exp $ */
+/* $Id: printmsg.c,v 1.26 2001/12/19 12:16:45 marka Exp $ */
 
 #include <config.h>
 
@@ -51,7 +51,7 @@ static const char *rcodetext[] = {
 	"FORMERR",
 	"SERVFAIL",
 	"NXDOMAIN",
-	"NOTIMPL",
+	"NOTIMP",
 	"REFUSED",
 	"YXDOMAIN",
 	"YXRRSET",
diff --git a/lib/dns/message.c b/lib/dns/message.c
index 056da8926b..d308545995 100644
--- a/lib/dns/message.c
+++ b/lib/dns/message.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: message.c,v 1.200 2001/12/06 04:38:47 marka Exp $ */
+/* $Id: message.c,v 1.201 2001/12/19 12:16:47 marka Exp $ */
 
 /***
  *** Imports
@@ -115,7 +115,7 @@ static const char *rcodetext[] = {
 	"FORMERR",
 	"SERVFAIL",
 	"NXDOMAIN",
-	"NOTIMPL",
+	"NOTIMP",
 	"REFUSED",
 	"YXDOMAIN",
 	"YXRRSET",