diff --git a/.gitignore b/.gitignore
index 36e2859c3c..0656e17945 100644
--- a/.gitignore
+++ b/.gitignore
@@ -106,6 +106,7 @@ y.tab.c
 /uncommon.mk
 /verconf.h
 /verconf.mk
+/version.i
 /web
 /yasmdata.rb
 
diff --git a/ChangeLog b/ChangeLog
index 105b9a3af9..95598d1861 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Thu Jul 16 00:35:42 2015  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* .gitignore: ignore version.i.
+
 Wed Jul 15 23:40:32 2015  Naohisa Goto  <ngotogenome@gmail.com>
 
 	* test/ruby/test_process.rb (test_deadlock_by_signal_at_forking):