diff --git a/ChangeLog b/ChangeLog
index b93143aefc..31ce18a727 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Fri Apr 20 12:27:04 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/optparse.rb: fix to override conv proc.
+
 Fri Apr 20 12:21:28 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* eval.c (ruby_cleanup): fixed access to out of bound, and inversed
diff --git a/lib/optparse.rb b/lib/optparse.rb
index 1808487337..854805a82a 100644
--- a/lib/optparse.rb
+++ b/lib/optparse.rb
@@ -1076,7 +1076,7 @@ class OptionParser
       # directly specified pattern(any object possible to match)
       if !(String === o) and o.respond_to?(:match)
         pattern = notwice(o, pattern, 'pattern')
-        conv ||= pattern.method(:convert).to_proc if pattern.respond_to?(:convert)
+        conv = pattern.method(:convert).to_proc if pattern.respond_to?(:convert)
         next
       end