diff --git a/ChangeLog b/ChangeLog
index c35417a37e..4059630cd6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Mon Dec  3 18:25:16 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* template/id.h.tmpl (preserved_ids): "empty?" is not an attribute name.
+
 Mon Dec  3 16:23:09 2012  Koichi Sasada  <ko1@atdot.net>
 
 	* vm_backtrace.c (vm_backtrace_to_ary): check negative size (2nd arg).
diff --git a/template/id.h.tmpl b/template/id.h.tmpl
index d5e82a989e..43a802324e 100644
--- a/template/id.h.tmpl
+++ b/template/id.h.tmpl
@@ -15,12 +15,11 @@ require 'optparse'
 
 op_id_offset = 128
 
-method_ids = %w[
+attr_ids = %w[
   Intern
   MethodMissing
   Length
   Size
-  EmptyP
   Gets
   Succ
   Each
@@ -44,6 +43,7 @@ token_op_ids = %w[
 
 preserved_ids = %w[
   NULL
+  EmptyP
   Respond_to
   Respond_to_missing
   IFUNC
@@ -113,11 +113,11 @@ enum ruby_method_ids {
     id<%=token%>,
 % end
     tPRESERVED_ID_END,
-% method_ids.each do |token|
+% attr_ids.each do |token|
     t<%=token%>,
 % end
 #define TOKEN2ID(n) id##n = ((t##n<<ID_SCOPE_SHIFT)|ID_LOCAL)
-% method_ids.each do |token|
+% attr_ids.each do |token|
     TOKEN2ID(<%=token%>),
 % end
     tLAST_OP_ID = tPRESERVED_ID_END-1,