diff --git a/ChangeLog b/ChangeLog
index b5d6a591b0..b70a774919 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Fri Oct 24 21:50:21 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* id.h, template/id.h.tmpl (enum ruby_method_ids): reordered.
+
 Fri Oct 24 21:19:45 2008  Keiju Ishitsuka  <keiju@ruby-lang.org>
 
 	* ext/mathn/rational.c: change several global functions.
@@ -25,7 +29,7 @@ Fri Oct 24 19:57:19 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
 Fri Oct 24 19:16:36 2008  URABE Shyouhei  <shyouhei@ruby-lang.org>
 
 	* id.h (enum ruby_method_ids): ISO C forbids comma at end of
-	  enumerator list
+	  enumerator list.
 
 Fri Oct 24 18:29:00 2008  Keiju Ishitsuka  <keiju@ruby-lang.org>
 
diff --git a/id.h b/id.h
index 4ccf69d80f..40aaf2254c 100644
--- a/id.h
+++ b/id.h
@@ -165,6 +165,10 @@ enum ruby_method_ids {
 #endif
     tLAST_ID,
 #define TOKEN2ID(n) id##n = ((t##n<<ID_SCOPE_SHIFT)|ID_LOCAL)
+#if SUPPORT_JOKE
+    TOKEN2ID(Bitblt),
+    TOKEN2ID(Answer),
+#endif
     TOKEN2ID(Intern),
     TOKEN2ID(MethodMissing),
     TOKEN2ID(Length),
@@ -175,10 +179,6 @@ enum ruby_method_ids {
     TOKEN2ID(Send),
     TOKEN2ID(__send__),
     TOKEN2ID(Initialize)
-#if SUPPORT_JOKE
-    ,TOKEN2ID(Bitblt)
-    ,TOKEN2ID(Answer)
-#endif
 };
 
 #endif /* RUBY_ID_H */
diff --git a/template/id.h.tmpl b/template/id.h.tmpl
index 84ca313a24..5fc0c528db 100644
--- a/template/id.h.tmpl
+++ b/template/id.h.tmpl
@@ -98,6 +98,10 @@ enum ruby_method_ids {
 #endif
     tLAST_ID,
 #define TOKEN2ID(n) id##n = ((t##n<<ID_SCOPE_SHIFT)|ID_LOCAL)
+#if SUPPORT_JOKE
+    TOKEN2ID(Bitblt),
+    TOKEN2ID(Answer),
+#endif
     TOKEN2ID(Intern),
     TOKEN2ID(MethodMissing),
     TOKEN2ID(Length),
@@ -107,11 +111,7 @@ enum ruby_method_ids {
     TOKEN2ID(Lambda),
     TOKEN2ID(Send),
     TOKEN2ID(__send__),
-    TOKEN2ID(Initialize),
-#if SUPPORT_JOKE
-    TOKEN2ID(Bitblt),
-    TOKEN2ID(Answer),
-#endif
+    TOKEN2ID(Initialize)
 };
 
 #endif /* RUBY_ID_H */