diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 007381ba11a..67c3b353032 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2009-07-12  Guanpeng Xu  <herberteuler@hotmail.com>
+
+	* pcomplete.el (pcomplete-comint-setup): Check for
+	shell-dynamic-complete-filename too.
+
 2009-07-11  Chong Yidong  <cyd@stupidchicken.com>
 
 	* simple.el (temporary-goal-column): Change the value for
diff --git a/lisp/pcomplete.el b/lisp/pcomplete.el
index 7a8c6e7c247..c24f3cedae5 100644
--- a/lisp/pcomplete.el
+++ b/lisp/pcomplete.el
@@ -590,8 +590,9 @@ this is `comint-dynamic-complete-functions'."
   (set (make-local-variable 'pcomplete-parse-arguments-function)
        'pcomplete-parse-comint-arguments)
   (make-local-variable completef-sym)
-  (let ((elem (memq 'comint-dynamic-complete-filename
-		    (symbol-value completef-sym))))
+  (let* ((funs (symbol-value completef-sym))
+	 (elem (or (memq 'comint-dynamic-complete-filename funs)
+		   (memq 'shell-dynamic-complete-filename funs))))
     (if elem
 	(setcar elem 'pcomplete)
       (add-to-list completef-sym 'pcomplete))))