diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 2cbadcfd11f..db7eb37c74b 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2006-06-19  Richard Guenther  <rguenther@suse.de>
+
+	* parser.c (CP_LEXER_BUFFER_SIZE): Adjust to assure near
+	power-of-two token vector size.
+
 2006-06-16  Mark Mitchell  <mark@codesourcery.com>
 
 	PR c++/28016
diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c
index 964ab0ee738..5820cb74a03 100644
--- a/gcc/cp/parser.c
+++ b/gcc/cp/parser.c
@@ -205,7 +205,7 @@ static void cp_parser_initial_pragma
   (cp_token *);
 
 /* Manifest constants.  */
-#define CP_LEXER_BUFFER_SIZE 10000
+#define CP_LEXER_BUFFER_SIZE ((256 * 1024) / sizeof (cp_token))
 #define CP_SAVED_TOKEN_STACK 5
 
 /* A token type for keywords, as opposed to ordinary identifiers.  */