diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index c94a8ccc653..be682bc06a8 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2004-09-20  Steven Bosscher  <stevenb@suse.de>
+
+	* lex.c (cxx_init): Don't set the ridpointer for RID_NULL
+	to null_node.
+
 2004-09-19  Mark Mitchell  <mark@codesourcery.com>
 
 	* decl2.c (determine_visibility): Allow class visibility
diff --git a/gcc/cp/lex.c b/gcc/cp/lex.c
index c7b1cf6e12f..8ae7e18a30f 100644
--- a/gcc/cp/lex.c
+++ b/gcc/cp/lex.c
@@ -352,7 +352,6 @@ cxx_init (void)
      not shared. */
   null_node = make_node (INTEGER_CST);
   TREE_TYPE (null_node) = c_common_type_for_size (POINTER_SIZE, 0);
-  ridpointers[RID_NULL] = null_node;
 
   /* The fact that G++ uses COMDAT for many entities (inline
      functions, template instantiations, virtual tables, etc.) mean