diff --git a/ChangeLog b/ChangeLog
index c7987fa481..ae72005fd6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Wed Nov 13 09:03:40 2013  Zachary Scott  <e@zzak.io>
+
+	* doc/regexp.rdoc: [DOC] add note about Bug #4044 as suggested by
+	  duerst-san in [ruby-core:43612] [Fixes GH-443] Patched by @rosenfeld
+	  https://github.com/ruby/ruby/pull/443
+
 Tue Nov 12 10:15:14 2013  Eric Hodel  <drbrain@segment7.net>
 
 	* test/rubygems/insure_session.rb:  Remove unused test file.
diff --git a/doc/regexp.rdoc b/doc/regexp.rdoc
index 59f1c45651..26779acb1a 100644
--- a/doc/regexp.rdoc
+++ b/doc/regexp.rdoc
@@ -121,7 +121,9 @@ The following metacharacters also behave like character classes:
 * <tt>/./</tt> - Any character except a newline.
 * <tt>/./m</tt> - Any character (the +m+ modifier enables multiline mode)
 * <tt>/\w/</tt> - A word character (<tt>[a-zA-Z0-9_]</tt>)
-* <tt>/\W/</tt> - A non-word character (<tt>[^a-zA-Z0-9_]</tt>)
+* <tt>/\W/</tt> - A non-word character (<tt>[^a-zA-Z0-9_]</tt>).
+  Please take a look at {Bug #4044}[https://bugs.ruby-lang.org/issues/4044] if
+  using <tt>/\W/</tt> with the <tt>/i</tt> modifier.
 * <tt>/\d/</tt> - A digit character (<tt>[0-9]</tt>)
 * <tt>/\D/</tt> - A non-digit character (<tt>[^0-9]</tt>)
 * <tt>/\h/</tt> - A hexdigit character (<tt>[0-9a-fA-F]</tt>)