diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index fdb8cf68e69..30553067a0b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2006-10-14  Lennart Borgman  <lennart.borgman.073@student.lu.se>
+
+	* filesets.el (filesets-cmd-shell-command): Quote buffer-file-name
+	to protect whitespace and metacharacters from the shell.
+
 2006-10-13  Giorgos Keramidas  <keramida@ceid.upatras.gr>  (tiny change)
 
 	* apropos.el (apropos-pattern-quoted): Fix a typo in a doc
diff --git a/lisp/filesets.el b/lisp/filesets.el
index eb8cdb02617..6e6ffc3add0 100644
--- a/lisp/filesets.el
+++ b/lisp/filesets.el
@@ -1701,7 +1701,7 @@ Replace <file-name> or <<file-name>> with filename."
 		  ok)
 	      t)))
     (when ok
-      (let ((cmd (format txt (buffer-file-name))))
+      (let ((cmd (format txt (shell-quote-argument (buffer-file-name)))))
 	(message "Filesets: %s" cmd)
 	(filesets-cmd-show-result cmd
 				  (shell-command-to-string cmd))))))