diff --git a/ChangeLog b/ChangeLog
index 7c1a26ebae..6445c04122 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Mon Jul 28 06:24:54 2014  Zachary Scott  <e@zzak.io>
+
+	* lib/uri/common.rb: [DOC] [Bug #9563] Recommend using URI.escape
+	  before parsing a uri to avoid invalid characters. Reported by
+	  Evgeniy Serykh.
+
 Mon Jul 28 05:55:56 2014  Zachary Scott  <e@zzak.io>
 
 	* time.c: [DOC] Clarify %Y in strftime, which can accept any digits
diff --git a/lib/uri/common.rb b/lib/uri/common.rb
index 006b271477..6378541cbe 100644
--- a/lib/uri/common.rb
+++ b/lib/uri/common.rb
@@ -219,6 +219,9 @@ module URI
   #   p uri.host
   #   # => "www.ruby-lang.org"
   #
+  # It's recommended to first ::escape the provided +uri_str+ if there are any
+  # invalid URI characters.
+  #
   def self.parse(uri)
     RFC3986_PARSER.parse(uri)
   end