diff --git a/ChangeLog b/ChangeLog
index ec08c6a37d..51846f7d71 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Jun  1 23:12:06 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* re.c (unescape_nonascii): \P{FOO} is also Unicode property in
+	  regexp. [ruby-core:30540]
+
 Tue Jun  1 21:29:39 2010  NARUSE, Yui  <naruse@ruby-lang.org>
 
 	* lib/net/http.rb: adding support to rfc5789 patch verb.
diff --git a/re.c b/re.c
index e272146c90..909e44daa3 100644
--- a/re.c
+++ b/re.c
@@ -2197,6 +2197,7 @@ unescape_nonascii(const char *p, const char *end, rb_encoding *enc,
                 }
 
               case 'p': /* \p{Hiragana} */
+              case 'P':
                 if (!*encp) {
                     *has_property = 1;
                 }