diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f6c90fc4d68..819a83c8876 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2010-06-12  Eli Zaretskii  <eliz@gnu.org>
+
+	* files.el (make-directory): Doc fix (bug#6396).
+
 2010-06-12  Michael Albinus  <michael.albinus@gmx.de>
 
 	* net/tramp.el (tramp-remote-process-environment): Protect version
diff --git a/lisp/files.el b/lisp/files.el
index 8d30659732f..d30531b17e5 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -4635,16 +4635,17 @@ or multiple mail buffers, etc."
       (force-mode-line-update))))
 
 (defun make-directory (dir &optional parents)
-  "Create the directory DIR and any nonexistent parent dirs.
-If DIR already exists as a directory, signal an error, unless PARENTS is set.
+  "Create the directory DIR and optionally any nonexistent parent dirs.
+If DIR already exists as a directory, signal an error, unless
+PARENTS is non-nil.
 
-Interactively, the default choice of directory to create
-is the current default directory for file names.
-That is useful when you have visited a file in a nonexistent directory.
+Interactively, the default choice of directory to create is the
+current buffer's default directory.  That is useful when you have
+visited a file in a nonexistent directory.
 
-Noninteractively, the second (optional) argument PARENTS says whether
-to create parent directories if they don't exist.  Interactively,
-this happens by default."
+Noninteractively, the second (optional) argument PARENTS, if
+non-nil, says whether to create parent directories that don't
+exist.  Interactively, this happens by default."
   (interactive
    (list (read-file-name "Make directory: " default-directory default-directory
 			 nil nil)