diff --git a/ChangeLog b/ChangeLog
index 501c1a98f6..fe96239ae3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Oct  6 23:43:10 2015  Koichi Sasada  <ko1@atdot.net>
+
+	* proc.c (rb_method_entry_min_max_arity): should support
+	  OPTIMIZED_METHOD_TYPE_CALL.
+
 Tue Oct  6 21:29:08 2015  Tanaka Akira  <akr@fsij.org>
 
 	* lib/tmpdir.rb (Dir.tmpdir): return duplicated string to be
diff --git a/proc.c b/proc.c
index f210464ec3..d7ed151780 100644
--- a/proc.c
+++ b/proc.c
@@ -2093,6 +2093,9 @@ rb_method_entry_min_max_arity(const rb_method_entry_t *me, int *max)
 	  case OPTIMIZED_METHOD_TYPE_SEND:
 	    *max = UNLIMITED_ARGUMENTS;
 	    return 0;
+	  case OPTIMIZED_METHOD_TYPE_CALL:
+	    *max = UNLIMITED_ARGUMENTS;
+	    return 0;
 	  default:
 	    break;
 	}