diff --git a/ChangeLog b/ChangeLog
index 85c254a552..55a31dcca1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Mon Oct 27 01:29:55 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* test/nkf/test_nkf.rb: add a test for [ruby-dev:36909].
+
 Mon Oct 27 01:05:48 2008  NARUSE, Yui  <naruse@ruby-lang.org>
 
 	* ext/nkf/nkf.c (rb_nkf_convert): avoid GC.
diff --git a/test/nkf/test_nkf.rb b/test/nkf/test_nkf.rb
index 279ad59e1a..2c6b964eb9 100644
--- a/test/nkf/test_nkf.rb
+++ b/test/nkf/test_nkf.rb
@@ -13,4 +13,10 @@ Ruby"
     assert_equal(::NKF::EUC, NKF.guess(str_euc))
   end
 
+  def test_ruby_dev_36909
+    assert_nothing_raised do
+      1000.times { NKF.nkf("--oc=eucJP-nkf", "foo") }
+    end
+  end
+
 end