diff --git a/ChangeLog b/ChangeLog
index de2d975d2e..334665ea29 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Sat May 25 18:08:06 2013  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* dir.c (bracket): fix copy-paste error.  When the first and last
+	  characters of fnmatch range have different length, fnmatch may
+	  have wrongly matched a path that does not really match.
+	  Coverity Scan found this bug.
+
 Sat May 25 17:06:25 2013  Koichi Sasada  <ko1@atdot.net>
 
 	* gc.c (after_gc_sweep): reduce full GC timing.
diff --git a/dir.c b/dir.c
index 29047dc528..9eccadbcf5 100644
--- a/dir.c
+++ b/dir.c
@@ -178,7 +178,7 @@ bracket(
 	    p = t2 + (r2 = rb_enc_mbclen(t2, pend, enc));
 	    if (ok) continue;
 	    if ((r <= (send-s) && memcmp(t1, s, r) == 0) ||
-		(r2 <= (send-s) && memcmp(t2, s, r) == 0)) {
+		(r2 <= (send-s) && memcmp(t2, s, r2) == 0)) {
 		ok = 1;
 		continue;
 	    }
diff --git a/test/ruby/test_fnmatch.rb b/test/ruby/test_fnmatch.rb
index 42f6a458f3..15e5d79e35 100644
--- a/test/ruby/test_fnmatch.rb
+++ b/test/ruby/test_fnmatch.rb
@@ -124,4 +124,9 @@ class TestFnmatch < Test::Unit::TestCase
       assert_file.fnmatch("{*,#{pattern_eucjp}}", path, File::FNM_EXTGLOB)
     end
   end
+
+  def test_unicode
+    assert_file.fnmatch("[a-\u3042]*", "\u3042")
+    assert_file.not_fnmatch("[a-\u3042]*", "\u3043")
+  end
 end