diff --git a/etc/ChangeLog b/etc/ChangeLog
index e0b951062012a5f33b506b69df4fcddc27d71c65..4a3c70393632a6081e739093844852c604a3f5b2 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,7 @@
+2005-01-22  David Kastrup  <dak@gnu.org>
+
+	* NEWS: Mention alias `find-grep' for `grep-find'.
+
 2005-01-22  Nick Roberts  <nickrob@snap.net.nz>
 
 	* TODO: Add entry for toolbar on ttys.
diff --git a/etc/NEWS b/etc/NEWS
index 45939ab9b155c3d0d01f12f1fd360738918d0f80..d486365dd91b4e3c8982c31e7a44ddb145d83d8d 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -358,6 +358,10 @@ can be saved and automatically revisited with the new Grep mode.
 
 *** Grep commands now have their own submenu and customization group.
 
++++
+*** `grep-find' is now also available under the name `find-grep' where
+people knowing `find-grep-dired' would probably expect it.
+
 *** The new variables `grep-window-height', `grep-auto-highlight', and
 `grep-scroll-output' can be used to override the corresponding
 compilation mode settings for grep commands.
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d5b86e7c1452021a5492279e7792c2c324ced16f..1b0181b63fb65a2fcec879453fa4ace51ce862bb 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2005-01-22  David Kastrup  <dak@gnu.org>
+
+	* progmodes/grep.el: Add alias `find-grep' for `grep-find'.
+
 2005-01-22  Eli Zaretskii  <eliz@gnu.org>
 
 	* type-break.el (type-break-mode): Add a test for
diff --git a/lisp/progmodes/grep.el b/lisp/progmodes/grep.el
index 8efa48aaa4868c9b3d6678716847651e2ede8de7..a3b1ab3abdd029218a9ec59f74f6b23baac39931 100644
--- a/lisp/progmodes/grep.el
+++ b/lisp/progmodes/grep.el
@@ -542,6 +542,9 @@ easily repeat a find command."
     (let ((null-device nil))		; see grep
       (grep command-args))))
 
+;;;###autoload
+(defalias 'find-grep 'grep-find)
+
 (defun grep-expand-command-macros (command &optional regexp files dir excl case-fold)
   "Patch grep COMMAND replacing <D>, etc."
   (setq command
diff --git a/man/ChangeLog b/man/ChangeLog
index 7182e5c8336f42074791bf63245613539c80a48d..cbcf03a7f43f998453a6504ea204c54a91040190 100644
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,3 +1,8 @@
+2005-01-22  David Kastrup  <dak@gnu.org>
+
+	* building.texi (Grep Searching): Mention alias `find-grep' for
+	`grep-find'.
+
 2005-01-20  Richard M. Stallman  <rms@gnu.org>
 
 	* calendar.texi (Time Intervals): Delete special stuff for MS-DOS.
diff --git a/man/building.texi b/man/building.texi
index db352ada9c7bc6e0fa53692c10b01d112fc9e699..cd42a4ef79dbe65100f26e14ecdc17cc66bef418 100644
--- a/man/building.texi
+++ b/man/building.texi
@@ -51,6 +51,7 @@ Invoke a compiler with the same command as in the last invocation of
 Run @code{grep} asynchronously under Emacs, with matching lines
 listed in the buffer named @samp{*grep*}.
 @item M-x grep-find
+@item M-x find-grep
 Run @code{grep} via @code{find}, with user-specified arguments, and
 collect output in the buffer named @samp{*grep*}.
 @item M-x kill-compilation
@@ -166,11 +167,12 @@ the tag (@pxref{Tags}) around point, and puts that into the default
 @code{grep} command.
 
 @findex grep-find
-  The command @kbd{M-x grep-find} is similar to @kbd{M-x grep}, but it
-supplies a different initial default for the command---one that runs
-both @code{find} and @code{grep}, so as to search every file in a
-directory tree.  See also the @code{find-grep-dired} command,
-in @ref{Dired and Find}.
+@findex find-grep
+  The command @kbd{M-x grep-find} (also available as @kbd{M-x
+find-grep}) is similar to @kbd{M-x grep}, but it supplies a different
+initial default for the command---one that runs both @code{find} and
+@code{grep}, so as to search every file in a directory tree.  See also
+the @code{find-grep-dired} command, in @ref{Dired and Find}.
 
 @node Compilation Mode
 @section Compilation Mode