diff --git a/ChangeLog b/ChangeLog
index 4a9e0fe5b2..e6e41e9d15 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Aug 22 23:51:19 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y: ONIG_OPTION_CAPTURE_GROUP conflicts with
+	  RE_OPTION_ONCE.  [ruby-dev:26852]
+
 Mon Aug 22 20:11:35 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* missing/vsnprintf.c (BSD__sprint): needs to call vwrite function
diff --git a/parse.y b/parse.y
index ddff8aada8..bab737f0e9 100644
--- a/parse.y
+++ b/parse.y
@@ -318,7 +318,7 @@ static void top_local_setup_gen _((struct parser_params*));
 static int lvar_defined_gen _((struct parser_params*, ID));
 #define lvar_defined(id) lvar_defined_gen(parser, id)
 
-#define RE_OPTION_ONCE 0x80
+#define RE_OPTION_ONCE (1<<16)
 
 #define NODE_STRTERM NODE_ZARRAY	/* nothing to gc */
 #define NODE_HEREDOC NODE_ARRAY 	/* 1, 3 to gc */