diff --git a/etc/NEWS b/etc/NEWS
index ef2b4b01f60..da68ed597db 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -56,6 +56,10 @@ affected by this, as SGI stopped supporting IRIX in December 2013.
 
 * Changes in Emacs 25.2
 
+---
+** `C-x h' (`mark-whole-buffer') will now avoid marking the prompt
+part of minibuffers.
+
 ---
 ** `find-library' now takes a prefix argument to pop to a different
 window.
diff --git a/lisp/simple.el b/lisp/simple.el
index 971f6006732..7573789ad5c 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -1075,7 +1075,9 @@ that uses or sets the mark."
   (interactive)
   (push-mark (point))
   (push-mark (point-max) nil t)
-  (goto-char (point-min)))
+  ;; This is really `point-min' in most cases, but if we're in the
+  ;; minibuffer, this is at the end of the prompt.
+  (goto-char (minibuffer-prompt-end)))
 
 
 ;; Counting lines, one way or another.