diff --git a/ChangeLog b/ChangeLog
index 339ee10e27..9e12386aa1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Dec 12 20:42:47 2010  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* template/id.h.tmpl: suppress all warning: "SUPPORT_JOKE" is not
+	  defined.  [ruby-dev:42730]
+
 Sun Dec 12 20:35:07 2010  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
 
 	* misc/rb_optparse.zsh: update how to install.
diff --git a/template/id.h.tmpl b/template/id.h.tmpl
index 0a4693ec4c..29548de8f4 100644
--- a/template/id.h.tmpl
+++ b/template/id.h.tmpl
@@ -50,6 +50,8 @@ end
 #include "parse.h"
 #endif
 
+#include "vm_opts.h" /* for SUPPORT_JOKE */
+
 #define symIFUNC ID2SYM(idIFUNC)
 #define symCFUNC ID2SYM(idCFUNC)
 
@@ -101,13 +103,13 @@ enum ruby_method_ids {
     t__send__,
     tInitialize,
     tUScore,
-#if defined SUPPORT_JOKE && SUPPORT_JOKE
+#if SUPPORT_JOKE
     tBitblt,
     tAnswer,
 #endif
     tLAST_ID,
 #define TOKEN2ID(n) id##n = ((t##n<<ID_SCOPE_SHIFT)|ID_LOCAL)
-#if defined SUPPORT_JOKE && SUPPORT_JOKE
+#if SUPPORT_JOKE
     TOKEN2ID(Bitblt),
     TOKEN2ID(Answer),
 #endif