diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 305cf5179c2..75c45000282 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2005-08-24  Nathan Sidwell  <nathan@codesourcery.com>
+
+	PR c++/22454
+	* parser.c (cp_lexer_peek_nth_token): Relax assert.
+
 2005-08-23  Nathan Sidwell  <nathan@codesourcery.com>
 
 	PR c++/23044
diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c
index 6eaf530b410..6712f00ae82 100644
--- a/gcc/cp/parser.c
+++ b/gcc/cp/parser.c
@@ -497,14 +497,15 @@ cp_lexer_peek_nth_token (cp_lexer* lexer, size_t n)
   cp_token *token;
 
   /* N is 1-based, not zero-based.  */
-  gcc_assert (n > 0 && lexer->next_token != &eof_token);
-
+  gcc_assert (n > 0);
+  
   if (cp_lexer_debugging_p (lexer))
     fprintf (cp_lexer_debug_stream,
 	     "cp_lexer: peeking ahead %ld at token: ", (long)n);
 
   --n;
   token = lexer->next_token;
+  gcc_assert (!n || token != &eof_token);
   while (n != 0)
     {
       ++token;
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index da7441dc04c..e787eaa4c1c 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2005-08-24  Nathan Sidwell  <nathan@codesourcery.com>
+
+	PR c++/22454
+	* g++.dg/parse/crash29.C: New.
+
 2005-08-23  DJ Delorie  <dj@redhat.com>
 
 	* gcc.c-torture/execute/stdarg-2.c (main): Make sure long
diff --git a/gcc/testsuite/g++.dg/parse/crash29.C b/gcc/testsuite/g++.dg/parse/crash29.C
new file mode 100644
index 00000000000..29ede042b9f
--- /dev/null
+++ b/gcc/testsuite/g++.dg/parse/crash29.C
@@ -0,0 +1,10 @@
+// Copyright (C) 2005 Free Software Foundation, Inc.
+// Contributed by Nathan Sidwell 23 Aug 2005 <nathan@codesourcery.com>
+
+// PR 22454: ICE
+// Origin: Volker Reichelt reichelt@gcc.gnu.org
+
+template<int> struct A
+{
+    A(void* = &operator new);
+};