diff -up bind-9.3.6-P1/bin/rndc/rndc-confgen.8.key bind-9.3.6-P1/bin/rndc/rndc-confgen.8
--- bind-9.3.6-P1/bin/rndc/rndc-confgen.8.key	2007-01-30 01:11:48.000000000 +0100
+++ bind-9.3.6-P1/bin/rndc/rndc-confgen.8	2009-02-18 18:19:27.000000000 +0100
@@ -125,7 +125,7 @@ Prints a short summary of the options an
 \-k \fIkeyname\fR
 .RS 4
 Specifies the key name of the rndc authentication key. This must be a valid domain name. The default is
-\fBrndc\-key\fR.
+\fBrndckey\fR.
 .RE
 .PP
 \-p \fIport\fR
diff -up bind-9.3.6-P1/bin/rndc/rndc-confgen.c.key bind-9.3.6-P1/bin/rndc/rndc-confgen.c
--- bind-9.3.6-P1/bin/rndc/rndc-confgen.c.key	2008-10-16 01:45:34.000000000 +0200
+++ bind-9.3.6-P1/bin/rndc/rndc-confgen.c	2009-02-18 18:18:32.000000000 +0100
@@ -46,7 +46,7 @@
 #include "util.h"
 
 #define DEFAULT_KEYLENGTH	128		/* Bits. */
-#define DEFAULT_KEYNAME		"rndc-key"
+#define DEFAULT_KEYNAME		"rndckey"
 #define DEFAULT_SERVER		"127.0.0.1"
 #define DEFAULT_PORT		953
 
diff -up bind-9.3.6-P1/bin/rndc/rndc-confgen.docbook.key bind-9.3.6-P1/bin/rndc/rndc-confgen.docbook
--- bind-9.3.6-P1/bin/rndc/rndc-confgen.docbook.key	2007-08-28 09:19:08.000000000 +0200
+++ bind-9.3.6-P1/bin/rndc/rndc-confgen.docbook	2009-02-18 18:18:32.000000000 +0100
@@ -161,7 +161,7 @@
 	  <para>
 	       Specifies the key name of the rndc authentication key.
 	       This must be a valid domain name.
-	       The default is <constant>rndc-key</constant>.
+	       The default is <constant>rndckey</constant>.
 	  </para>
 	</listitem>
       </varlistentry>
diff -up bind-9.3.6-P1/bin/rndc/rndc.conf.key bind-9.3.6-P1/bin/rndc/rndc.conf
--- bind-9.3.6-P1/bin/rndc/rndc.conf.key	2004-03-06 11:21:32.000000000 +0100
+++ bind-9.3.6-P1/bin/rndc/rndc.conf	2009-02-18 18:18:32.000000000 +0100
@@ -23,14 +23,11 @@
 
 options {
         default-server  localhost;
-        default-key     "key";
+        default-key     "rndckey";
 };
 
 server localhost {
-        key     "key";
+        key     "rndckey";
 };
 
-key "key" {
-        algorithm       hmac-md5;
-        secret "c3Ryb25nIGVub3VnaCBmb3IgYSBtYW4gYnV0IG1hZGUgZm9yIGEgd29tYW4K";
-};
+include "/etc/rndc.key";