diff --git a/RELNOTES b/RELNOTES
index 5756e367..b551b62f 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -26,6 +26,11 @@ as well as how to find documentation and report bugs, please consult
 the README file.
 
 
+			Changes since 3.1.0a1
+
+- A bug in the FQDN universe that added FQDN codes to the NWIP universe's
+  hash table was repaired.
+
 			Changes since 3.0 (New Features)
 
 - A workaround for certain STSN servers that send a mangled domain-name
diff --git a/common/tables.c b/common/tables.c
index fb7d3367..980ba30a 100644
--- a/common/tables.c
+++ b/common/tables.c
@@ -34,7 +34,7 @@
 
 #ifndef lint
 static char copyright[] =
-"$Id: tables.c,v 1.58 2006/07/26 15:43:52 shane Exp $ Copyright (c) 2004-2006 Internet Systems Consortium.  All rights reserved.\n";
+"$Id: tables.c,v 1.59 2006/09/18 17:35:44 dhankins Exp $ Copyright (c) 2004-2006 Internet Systems Consortium.  All rights reserved.\n";
 #endif /* not lint */
 
 #include "dhcpd.h"
@@ -746,7 +746,7 @@ void initialize_common_option_spaces()
 				  FQDN_HASH_SIZE, MDL))
 		log_fatal ("Can't allocate fqdn option hash table.");
 	for (i = 0 ; fqdn_options[i].name ; i++) {
-		option_code_hash_add(nwip_universe.code_hash,
+		option_code_hash_add(fqdn_universe.code_hash,
 				     &fqdn_options[i].code, 0,
 				     &fqdn_options[i], MDL);
 		option_name_hash_add(fqdn_universe.name_hash,