diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c6a430491b3..ec29758fd51 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2012-05-08  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* shell.el (shell-completion-vars): Fix last change (bug#11348).
+
 2012-05-07  Chong Yidong  <cyd@gnu.org>
 
 	* ansi-color.el (ansi-color-process-output): Check for validity of
diff --git a/lisp/shell.el b/lisp/shell.el
index 737f69c021d..f7a530102ff 100644
--- a/lisp/shell.el
+++ b/lisp/shell.el
@@ -432,7 +432,7 @@ Shell buffers.  It implements `shell-completion-execonly' for
   (set (make-local-variable 'pcomplete-parse-arguments-function)
        #'shell-parse-pcomplete-arguments)
   (set (make-local-variable 'pcomplete-arg-quote-list)
-       shell-delimiter-argument-list)
+       comint-file-name-quote-list)
   (set (make-local-variable 'pcomplete-termination-string)
        (cond ((not comint-completion-addsuffix) "")
              ((stringp comint-completion-addsuffix)