diff --git a/ChangeLog b/ChangeLog
index 36c59e19d8..4b7d024950 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Jan 29 16:17:07 2016  Lucas Buchala  <lucasbuchala@gmail.com>
+
+	* enum.c (enum_take_while, enum_drop_while): rename block
+	  parameter to obj, since they are generic objects.  [Fix GH-1226]
+
 Fri Jan 29 14:15:26 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* lib/erb.rb (ERB::Compiler#detect_magic_comment): allow
diff --git a/enum.c b/enum.c
index 9f94d2a2f5..681d58f14a 100644
--- a/enum.c
+++ b/enum.c
@@ -2575,7 +2575,7 @@ take_while_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, ary))
 
 /*
  *  call-seq:
- *     enum.take_while { |arr| block } -> array
+ *     enum.take_while { |obj| block } -> array
  *     enum.take_while                 -> an_enumerator
  *
  *  Passes elements to the block until the block returns +nil+ or +false+,
@@ -2659,7 +2659,7 @@ drop_while_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, args))
 
 /*
  *  call-seq:
- *     enum.drop_while { |arr| block }  -> array
+ *     enum.drop_while { |obj| block }  -> array
  *     enum.drop_while                  -> an_enumerator
  *
  *  Drops elements up to, but not including, the first element for