diff --git a/ChangeLog b/ChangeLog
index f89adc960e..9e9bd56277 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Oct 26 17:09:59 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/ruby.h (rb_intern): use prefixed version macro
+	  RUBY_CONST_ID_CACHE.
+
 Wed Oct 26 11:28:25 2016  URABE Shyouhei  <shyouhei@ruby-lang.org>
 
 	* NEWS: added several entries which (if I remember correctly) are
diff --git a/include/ruby/ruby.h b/include/ruby/ruby.h
index 79cc7c94c1..d72e7784f1 100644
--- a/include/ruby/ruby.h
+++ b/include/ruby/ruby.h
@@ -1720,7 +1720,7 @@ VALUE rb_check_symbol(volatile VALUE *namep);
  * since gcc-2.7.2.3 at least. */
 #define rb_intern(str) \
     (__builtin_constant_p(str) ? \
-        __extension__ (CONST_ID_CACHE((ID), (str))) : \
+        __extension__ (RUBY_CONST_ID_CACHE((ID), (str))) : \
         rb_intern(str))
 #define rb_intern_const(str) \
     (__builtin_constant_p(str) ? \