diff --git a/ChangeLog b/ChangeLog
index da8c6d7613..62ff9d9f11 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Tue Jul  8 22:28:25 2008  Koichi Sasada  <ko1@atdot.net>
+
+	* lib/debug.rb, lib/profile.rb: fix to use RubyVM.
+
+	* lib/rdoc/parsers/parse_c.rb: ditto.
+
 Tue Jul  8 21:45:22 2008  Yusuke Endoh  <mame@tsg.ne.jp>
 
 	* vm.c (rb_vm_mark): mark the last element of special_exceptions.
@@ -9,12 +15,6 @@ Tue Jul  8 19:55:40 2008  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
 
 	* test/win32ole/test_win32ole_event.rb: ditto
 
-Tue Jul  8 13:44:01 2008  Koichi Sasada  <ko1@atdot.net>
-
-	* lib/debug.rb, lib/profile.rb: fix to use RubyVM.
-
-	* lib/rdoc/parsers/parse_c.rb: ditto.
-
 Tue Jul  8 13:38:22 2008  Koichi Sasada  <ko1@atdot.net>
 
 	* compile.h: fix to skip inserting a trace insn.
diff --git a/lib/debug.rb b/lib/debug.rb
index aeebbc5f8c..8a2f4f1a12 100644
--- a/lib/debug.rb
+++ b/lib/debug.rb
@@ -904,7 +904,7 @@ stdout.printf "Emacs support available.\n\n"
 set_trace_func proc { |event, file, line, id, binding, klass, *rest|
   DEBUGGER__.context.trace_func event, file, line, id, binding, klass
 }
-VM::InstructionSequence.compile_option = {
+RubyVM::InstructionSequence.compile_option = {
   trace_instruction: true
 }
 end
diff --git a/lib/profile.rb b/lib/profile.rb
index 19275a3fd2..2aeecce908 100644
--- a/lib/profile.rb
+++ b/lib/profile.rb
@@ -1,6 +1,6 @@
 require 'profiler'
 
-VM::InstructionSequence.compile_option = {
+RubyVM::InstructionSequence.compile_option = {
   :trace_instruction => true,
   :specialized_instruction => false
 }
diff --git a/lib/rdoc/parsers/parse_c.rb b/lib/rdoc/parsers/parse_c.rb
index 745ee7aedd..d398b1aa71 100644
--- a/lib/rdoc/parsers/parse_c.rb
+++ b/lib/rdoc/parsers/parse_c.rb
@@ -36,7 +36,7 @@ module RDoc
     "rb_cTime"             => "Time",
     "rb_cTrueClass"        => "TrueClass",
     "rb_cStruct"           => "Struct",
-    "rb_cVM"               => "VM",
+    "rb_cRubyVM"           => "RubyVM",
     "rb_eException"        => "Exception",
     "rb_eStandardError"    => "StandardError",
     "rb_eSystemExit"       => "SystemExit",