diff --git a/src/include/catalog/indexing.h b/src/include/catalog/indexing.h
index 8c61143a56..3531c4b9e8 100644
--- a/src/include/catalog/indexing.h
+++ b/src/include/catalog/indexing.h
@@ -7,7 +7,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: indexing.h,v 1.29 1999/11/22 17:56:37 momjian Exp $
+ * $Id: indexing.h,v 1.30 1999/11/23 04:47:39 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -182,7 +182,8 @@ DECLARE_UNIQUE_INDEX(pg_inherits_relid_seqno_index on pg_inherits using btree(in
 DECLARE_UNIQUE_INDEX(pg_language_name_index on pg_language using btree(lanname name_ops));
 DECLARE_UNIQUE_INDEX(pg_language_oid_index on pg_language using btree(oid oid_ops));
 DECLARE_UNIQUE_INDEX(pg_listener_relname_pid_index on pg_listener using btree(relname name_ops, listenerpid int4_ops));
-DECLARE_UNIQUE_INDEX(pg_opclass_deftype_index on pg_opclass using btree(opcdeftype oid_ops));
+/* This column needs to allow multiple zero entries, but is in the cache */
+DECLARE_INDEX(pg_opclass_deftype_index on pg_opclass using btree(opcdeftype oid_ops));
 DECLARE_UNIQUE_INDEX(pg_opclass_name_index on pg_opclass using btree(opcname name_ops));
 DECLARE_UNIQUE_INDEX(pg_operator_oid_index on pg_operator using btree(oid oid_ops));
 DECLARE_UNIQUE_INDEX(pg_operator_oprname_l_r_k_index on pg_operator using btree(oprname name_ops, oprleft oid_ops, oprright oid_ops, oprkind char_ops));
diff --git a/src/include/catalog/pg_opclass.h b/src/include/catalog/pg_opclass.h
index 0ed4e2a88c..8b670e3e07 100644
--- a/src/include/catalog/pg_opclass.h
+++ b/src/include/catalog/pg_opclass.h
@@ -7,7 +7,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: pg_opclass.h,v 1.21 1999/11/22 17:56:37 momjian Exp $
+ * $Id: pg_opclass.h,v 1.22 1999/11/23 04:47:39 momjian Exp $
  *
  * NOTES
  *	  the genbki.sh script reads this file and generates .bki
@@ -68,11 +68,9 @@ DATA(insert OID =  422 (	box_ops			603   ));
 DESCR("");
 DATA(insert OID =  423 (	float8_ops		701   ));
 DESCR("");
-/* Technically, deftype is wrong, but it must be unique for index, bjm */
-DATA(insert OID =  424 (	int24_ops		424   ));
+DATA(insert OID =  424 (	int24_ops		  0   ));
 DESCR("");
-/* Technically, deftype is wrong, but it must be unique for index, bjm */
-DATA(insert OID =  425 (	int42_ops		425   ));
+DATA(insert OID =  425 (	int42_ops		  0   ));
 DESCR("");
 DATA(insert OID =  426 (	int4_ops		 23   ));
 DESCR("");
@@ -87,8 +85,7 @@ DATA(insert OID =  431 (	text_ops		 25   ));
 DESCR("");
 DATA(insert OID =  432 (	abstime_ops		702   ));
 DESCR("");
-/* Technically, deftype is wrong, but it must be unique for index, bjm */
-DATA(insert OID =  433 (	bigbox_ops		433   ));
+DATA(insert OID =  433 (	bigbox_ops		603   ));
 DESCR("");
 DATA(insert OID =  434 (	poly_ops		604   ));
 DESCR("");