diff --git a/ChangeLog b/ChangeLog
index c630106891..2e76e717a7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Thu Oct 11 03:37:08 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* bootstraptest/test_block.rb: add tests for block with super.
+
 Thu Oct 11 02:54:07 2012  Koichi Sasada  <ko1@atdot.net>
 
 	* vm_dump.c: fix debug prints to catch up recent changes
diff --git a/bootstraptest/test_block.rb b/bootstraptest/test_block.rb
index ea6768cc25..6a2ccfc6da 100644
--- a/bootstraptest/test_block.rb
+++ b/bootstraptest/test_block.rb
@@ -565,3 +565,35 @@ assert_normal_exit %q{
   t.test_for_bug
 }, '[ruby-core:14395]'
 
+assert_equal 'true', %q{
+  class C0
+    def foo
+      block_given?
+    end
+  end
+
+  class C1 < C0
+    def foo
+      super
+    end
+  end
+
+  C1.new.foo{}
+}
+
+assert_equal 'true', %q{
+  class C0
+    def foo
+      block_given?
+    end
+  end
+
+  class C1 < C0
+    def foo
+      super()
+    end
+  end
+
+  C1.new.foo{}
+}
+