diff --git a/ChangeLog b/ChangeLog
index 51b79feea3..c0cade390e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sat Feb 24 10:32:59 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* common.mk: change vm_macro.def -> vm_macro.inc rule.
+
 Sat Feb 24 10:38:05 2007  Minero Aoki  <aamine@loveruby.net>
 
 	* ext/racc/cparse/cparse.c (cparse_params_mark): remove useless
@@ -11,6 +15,7 @@ Sat Feb 24 07:31:35 2007  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
 	* test/win32ole/test_win32ole_variant.rb: add some test for
 	  WIN32OLE_VARIANT.array, WIN32OLE_VARIANT#value=.
 
+>>>>>>> .r11835
 Fri Feb 23 18:37:55 2007  Minero Aoki  <aamine@loveruby.net>
 
 	* test/ruby/test_yield.rb: new test.
diff --git a/common.mk b/common.mk
index 96ffaf89ae..64ba63c222 100644
--- a/common.mk
+++ b/common.mk
@@ -541,7 +541,7 @@ blockinlining.$(OBJEXT): {$(VPATH)}ruby.h {$(VPATH)}defines.h \
 MATZRUBY = $(MATZRUBYDIR)ruby
 
 INSNS	= opt_sc.inc optinsn.inc optunifs.inc insns.inc \
-	  vmtc.inc vm.inc vm_macro.inc
+	  vmtc.inc vm.inc
 
 INSNS2VMOPT = --srcdir="$(srcdir)"
 
@@ -561,12 +561,14 @@ vmtc.inc: $(srcdir)/template/vmtc.inc.tmpl
 
 vm.inc: $(srcdir)/template/vm.inc.tmpl
 
-vm_macro.inc: $(srcdir)/vm_macro.def
-
 $(INSNS): $(srcdir)/insns.def {$(VPATH)}vm_opts.h
 	$(RM) $(PROGRAM)
 	$(BASERUBY) $(srcdir)/tool/insns2vm.rb $(INSNS2VMOPT)
 
+vm_macro.inc: $(srcdir)/vm_macro.def
+	$(RM) $(PROGRAM)
+	$(BASERUBY) $(srcdir)/tool/insns2vm.rb $(INSNS2VMOPT) vm_macro.inc
+
 incs: $(INSNS)
 
 docs: