diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index aea6e7d6d10..fe0559d07aa 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2004-05-23  Jesper Harder  <harder@ifa.au.dk>
+
+	* progmodes/grep.el (grep-tree): Ensure that DIR argument is
+	interpreted as a directory.
+
 2004-05-22  Richard M. Stallman  <rms@gnu.org>
 
 	* textmodes/paragraphs.el (sentence-end): Match unicode curly quotes
diff --git a/lisp/progmodes/grep.el b/lisp/progmodes/grep.el
index 94937ba1e87..c5e322a657a 100644
--- a/lisp/progmodes/grep.el
+++ b/lisp/progmodes/grep.el
@@ -533,7 +533,8 @@ those sub directories of DIR."
 	  (files
 	   (read-string (concat "Search for \"" regexp "\" in files (default "   grep-tree-last-files  "): ")))
 	  (dir
-	   (read-directory-name "Base directory: " nil default-directory t)))
+	   (file-name-as-directory
+	    (read-directory-name "Base directory: " nil default-directory t))))
      (list regexp files dir)))
   (unless grep-tree-command
     (grep-compute-defaults))