diff --git a/lib/dns/include/dns/keyvalues.h b/lib/dns/include/dns/keyvalues.h
index 966dc417a0..781fa7c861 100644
--- a/lib/dns/include/dns/keyvalues.h
+++ b/lib/dns/include/dns/keyvalues.h
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: keyvalues.h,v 1.11 2001/01/09 21:52:57 bwelling Exp $ */
+/* $Id: keyvalues.h,v 1.12 2001/09/19 00:14:48 bwelling Exp $ */
 
 #ifndef DNS_KEYVALUES_H
 #define DNS_KEYVALUES_H 1
@@ -62,7 +62,10 @@
 #define DNS_KEYALG_DH		2       /* Diffie Hellman KEY */
 #define DNS_KEYALG_DSA		3       /* DSA KEY */
 #define DNS_KEYALG_DSS		NS_ALG_DSA
-#define DNS_KEYALG_EXPIREONLY	253     /* No alg, no security */
+#define DNS_KEYALG_ECC		4
+#define DNS_KEYALG_RSASHA1	5
+#define DNS_KEYALG_INDIRECT	252
+#define DNS_KEYALG_PRIVATEDNS	253
 #define DNS_KEYALG_PRIVATEOID	254     /* Key begins with OID giving alg */
 
 /* Protocol values  */
diff --git a/lib/dns/rdata.c b/lib/dns/rdata.c
index 5d67f5754a..1a3461d4e8 100644
--- a/lib/dns/rdata.c
+++ b/lib/dns/rdata.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: rdata.c,v 1.149 2001/09/16 05:27:04 marka Exp $ */
+/* $Id: rdata.c,v 1.150 2001/09/19 00:14:47 bwelling Exp $ */
 
 #include <config.h>
 #include <ctype.h>
@@ -32,6 +32,7 @@
 #include <dns/cert.h>
 #include <dns/compress.h>
 #include <dns/keyflags.h>
+#include <dns/keyvalues.h>
 #include <dns/rcode.h>
 #include <dns/rdata.h>
 #include <dns/rdataclass.h>
@@ -272,14 +273,14 @@ static const char decdigits[] = "0123456789";
 /* RFC2535 section 7, RFC3110 */
 
 #define SECALGNAMES \
-	{ 1, "RSAMD5", 0 }, \
-	{ 2, "DH", 0 }, \
-	{ 3, "DSA", 0 }, \
-	{ 4, "ECC", 0 }, \
-	{ 5, "RSASHA1", 0 }, \
-	{ 252, "INDIRECT", 0 }, \
-	{ 253, "PRIVATEDNS", 0 }, \
-	{ 254, "PRIVATEOID", 0 }, \
+	{ DNS_KEYALG_RSAMD5, "RSAMD5", 0 }, \
+	{ DNS_KEYALG_DH, "DH", 0 }, \
+	{ DNS_KEYALG_DSA, "DSA", 0 }, \
+	{ DNS_KEYALG_ECC, "ECC", 0 }, \
+	{ DNS_KEYALG_RSASHA1, "RSASHA1", 0 }, \
+	{ DNS_KEYALG_INDIRECT, "INDIRECT", 0 }, \
+	{ DNS_KEYALG_PRIVATEDNS, "PRIVATEDNS", 0 }, \
+	{ DNS_KEYALG_PRIVATEOID, "PRIVATEOID", 0 }, \
 	{ 0, NULL, 0}
 
 /* RFC2535 section 7.1 */