diff --git a/ChangeLog b/ChangeLog
index 735ce25348..a78ff61576 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Thu Apr 10 19:41:00 2008  Akinori MUSHA  <knu@iDaemons.org>
+
+	* eval.c (rb_f_loop): Mention StopIteration in the document.
+
 Thu Apr 10 19:23:55 2008  Akinori MUSHA  <knu@iDaemons.org>
 
 	* array.c (rb_ary_pop_m, rb_ary_shift_m): Update documents for
diff --git a/eval.c b/eval.c
index 4f5f29b0cc..f3a0806654 100644
--- a/eval.c
+++ b/eval.c
@@ -984,6 +984,8 @@ loop_i()
  *       break if !line or line =~ /^qQ/
  *       # ...
  *     end
+ *
+ *  StopIteration raised in the block breaks the loop.
  */
 
 static VALUE