diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 25b32666754..b0a07df8064 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2015-02-24  Johan Claesson  <johanclaesson@bredband.net>  (tiny change)
+
+	* filecache.el (file-cache-filter-regexps):
+	Add lock files.  (Bug#19516)
+
 2015-02-24  Glenn Morris  <rgm@gnu.org>
 
 	* mail/rmailsum.el (rmail-summary-next-all)
diff --git a/lisp/filecache.el b/lisp/filecache.el
index d036107d6fb..fd99ee0fb93 100644
--- a/lisp/filecache.el
+++ b/lisp/filecache.el
@@ -154,11 +154,12 @@
   ;; These are also used in buffers containing lines of file names,
   ;; so the end-of-name is matched with $ rather than \\'.
   (list "~$" "\\.o$" "\\.exe$" "\\.a$" "\\.elc$" ",v$" "\\.output$"
-	"\\.$" "#$" "\\.class$")
+	"\\.$" "#$" "\\.class$" "/\\.#")
   "List of regular expressions used as filters by the file cache.
 File names which match these expressions will not be added to the cache.
 Note that the functions `file-cache-add-file' and `file-cache-add-file-list'
 do not use this variable."
+  :version "25.1"                       ; added "/\\.#"
   :type '(repeat regexp)
   :group 'file-cache)