diff --git a/ChangeLog b/ChangeLog
index 073281fe87..d719f43c51 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Sep 14 16:57:27 2014  Eric Wong  <e@80x24.org>
+
+	* template/vm.inc.tmpl: "insns.c" => "insns.def"
+	* tool/instruction.rb: typo fix
+
 Sun Sep 14 12:29:52 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
 
 	* test/test_tracer.rb: fixed testcase for rubygems update.
diff --git a/template/vm.inc.tmpl b/template/vm.inc.tmpl
index c21b3a83eb..11c6d1bcf5 100644
--- a/template/vm.inc.tmpl
+++ b/template/vm.inc.tmpl
@@ -8,7 +8,7 @@
   This file is auto generated by insns2vm.rb
   DO NOT TOUCH!
 
-  If you want to fix something, you must edit 'insns.c'
+  If you want to fix something, you must edit 'insns.def'
  */
 
 <%=
diff --git a/tool/instruction.rb b/tool/instruction.rb
index 8342dde8cb..78037f938c 100755
--- a/tool/instruction.rb
+++ b/tool/instruction.rb
@@ -309,7 +309,7 @@ class RubyVM
       opes = insn.opes
 
       if opes.size != opts.size
-        raise "operand size mismatcvh for #{insn.name} (opes: #{opes.size}, opts: #{opts.size})"
+        raise "operand size mismatch for #{insn.name} (opes: #{opes.size}, opts: #{opts.size})"
       end
 
       ninsn = insn.name + '_OP_' + opts.map{|e| label_escape(e)}.join('_')