diff --git a/.gitignore b/.gitignore
index 694f74edfac..71fbe7e8d36 100644
--- a/.gitignore
+++ b/.gitignore
@@ -42,5 +42,6 @@ configure
 data
 emacs*.tar.gz
 leim*.tar.gz
+lock
 site-lisp
 update.log
diff --git a/ChangeLog b/ChangeLog
index 2f054186bfe..d216ab222d8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2005-08-03  Juanma Barranquero  <lekktu@gmail.com>
+
+	* .cvsignore: Add `lock'.
+
 2005-07-28  Juanma Barranquero  <lekktu@gmail.com>
 
 	* .cvsignore: Add `data' and `site-lisp' (for in-place installs).