diff --git a/ChangeLog b/ChangeLog
index 736f6f7e31..0fd58c9217 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Apr 22 23:47:05 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* doc/regexp.rdoc (comments): [DOC] terminators cannot appear in
+	  comments.  [ruby-core:74838] [Bug #12256]
+
 Fri Apr 22 23:44:07 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* extension.rdoc, extension.ja.rdoc: [DOC] Fix some errors.
diff --git a/doc/regexp.rdoc b/doc/regexp.rdoc
index 02a5f300ee..7384670557 100644
--- a/doc/regexp.rdoc
+++ b/doc/regexp.rdoc
@@ -568,6 +568,9 @@ Comments can be included in a non-<tt>x</tt> pattern with the
 <tt>(?#</tt><i>comment</i><tt>)</tt> construct, where <i>comment</i> is
 arbitrary text ignored by the regexp engine.
 
+Comments in regexp literals cannot include unescaped terminator
+characters.
+
 == Encoding
 
 Regular expressions are assumed to use the source encoding. This can be
diff --git a/version.h b/version.h
index 29ffee27e6..d730cbc2e9 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
 #define RUBY_VERSION "2.3.0"
 #define RUBY_RELEASE_DATE "2016-04-22"
-#define RUBY_PATCHLEVEL 98
+#define RUBY_PATCHLEVEL 99
 
 #define RUBY_RELEASE_YEAR 2016
 #define RUBY_RELEASE_MONTH 4