diff --git a/ChangeLog b/ChangeLog
index d5a23be544..ea7a1bd28c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+Thu Dec 13 11:22:33 2012  Koichi Sasada  <ko1@atdot.net>
+
+	* method.h: remove "VM_METHOD_TYPE__MAX" from rb_method_type_t.
+	  rb_method_type_t is not a number and "_MAX" causes misunderstanding.
+
+	* proc.c (rb_method_entry_arity): ditto.
+
+	* vm_eval.c (vm_call0_body): ditto.
+
+	* vm_insnhelper.c (vm_call_method): ditto.
+
 Wed Dec 12 21:40:45 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* lib/tmpdir.rb (Dir::Tmpname#create): deal with a prefix name which
diff --git a/method.h b/method.h
index 56b33e7b47..6ad28c60ad 100644
--- a/method.h
+++ b/method.h
@@ -46,9 +46,7 @@ typedef enum {
     VM_METHOD_TYPE_OPTIMIZED, /* Kernel#send, Proc#call, etc */
     VM_METHOD_TYPE_MISSING,   /* wrapper for method_missing(id) */
     VM_METHOD_TYPE_CFUNC_FRAMELESS,
-    VM_METHOD_TYPE_REFINED,
-
-    VM_METHOD_TYPE__MAX
+    VM_METHOD_TYPE_REFINED
 } rb_method_type_t;
 
 struct rb_call_info_struct;
diff --git a/proc.c b/proc.c
index 03355dff18..a112677e69 100644
--- a/proc.c
+++ b/proc.c
@@ -1686,8 +1686,6 @@ rb_method_entry_arity(const rb_method_entry_t *me)
       }
       case VM_METHOD_TYPE_REFINED:
 	return -1;
-      case VM_METHOD_TYPE__MAX:
-	break;
     }
     rb_bug("rb_method_entry_arity: invalid method entry type (%d)", def->type);
 
diff --git a/vm_eval.c b/vm_eval.c
index 4d5e47d5f4..190d2bc559 100644
--- a/vm_eval.c
+++ b/vm_eval.c
@@ -227,8 +227,6 @@ vm_call0_body(rb_thread_t* th, rb_call_info_t *ci, const VALUE *argv)
 	}
       case VM_METHOD_TYPE_UNDEF:
 	break;
-      case VM_METHOD_TYPE__MAX:
-	break;
     }
     rb_bug("vm_call0: unsupported method type (%d)", ci->me->def->type);
     return Qundef;
diff --git a/vm_insnhelper.c b/vm_insnhelper.c
index 64b812dd4b..caaab54e1d 100644
--- a/vm_insnhelper.c
+++ b/vm_insnhelper.c
@@ -1786,8 +1786,6 @@ vm_call_method(rb_thread_t *th, rb_control_frame_t *cfp, rb_call_info_t *ci)
 		    goto zsuper_method_dispatch;
 		}
 	      }
-	      case VM_METHOD_TYPE__MAX:
-		break;
 	    }
 	    rb_bug("vm_call_method: unsupported method type (%d)", ci->me->def->type);
 	}