diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a174e83b5cd..6f73827fa17 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2006-04-13  Romain Francoise  <romain@orebokech.com>
+
+	* pcvs-parse.el (cvs-parse-table): Use `with-temp-buffer' to avoid
+	leaving temporary .cvsignore buffers behind.
+
 2006-04-13  Carsten Dominik  <dominik@science.uva.nl>
 
 	* textmodes/org.el: (org-set-regexps-and-options,
diff --git a/lisp/pcvs-parse.el b/lisp/pcvs-parse.el
index 2053d8f5bd5..892dc962767 100644
--- a/lisp/pcvs-parse.el
+++ b/lisp/pcvs-parse.el
@@ -271,8 +271,8 @@ The remaining KEYS are passed directly to `cvs-create-fileinfo'."
 	;; on the current branch (either because it only exists in other
 	;; branches, or because it's been removed).
 	(if (ignore-errors
-	      (with-current-buffer
-		  (find-file-noselect (expand-file-name
+	      (with-temp-buffer
+		(insert-file-contents (expand-file-name
 				       ".cvsignore" (file-name-directory dir)))
 		(goto-char (point-min))
 		(re-search-forward