diff --git a/ChangeLog b/ChangeLog
index 017f735b04..e80dcac63b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Nov 13 10:55:24 2005  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/uri/common.rb (escape): regard second argument as a
+	  character set. [ruby-dev:27692]
+
 Sat Nov 12 08:36:40 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* configure.in, eval.c, intern.h: check fd_mask type.
diff --git a/lib/uri/common.rb b/lib/uri/common.rb
index 2263fbddde..f74f0eb2e1 100644
--- a/lib/uri/common.rb
+++ b/lib/uri/common.rb
@@ -261,6 +261,7 @@ module URI
     # +unsafe+::
     #   Regexp that matches all symbols that must be replaced with codes.
     #   By default uses <tt>REGEXP::UNSAFE</tt>.
+    #   When this argument is a String, it represents a character set.
     #
     # == Description
     #
@@ -277,10 +278,13 @@ module URI
     #   p URI.unescape(enc_uri)
     #   # => "http://example.com/?a=\t\r"
     #
+    #   p URI.escape("@?@!", "!?")
+    #   # => "@%3F@%21"
+    #
     def escape(str, unsafe = UNSAFE)
       unless unsafe.kind_of?(Regexp)
         # perhaps unsafe is String object
-        unsafe = Regexp.new(Regexp.quote(unsafe), false, 'N')
+        unsafe = Regexp.new("[#{Regexp.quote(unsafe)}]", false, 'N')
       end
       str.gsub(unsafe) do |us|
         tmp = ''