diff --git a/doc/emacs/rmail.texi b/doc/emacs/rmail.texi
index 7a2ef9be16e..08add98b733 100644
--- a/doc/emacs/rmail.texi
+++ b/doc/emacs/rmail.texi
@@ -1535,7 +1535,10 @@ This is equivalent to specifying the @samp{file} protocol:
 absolute file name of the @command{movemail} executable.  If it is
 @code{nil}, Rmail searches for @command{movemail} in the directories
 listed in @code{rmail-movemail-search-path}, then in @code{exec-path}
-(@pxref{Shell}), then in @code{exec-directory}.
+(@pxref{Shell}), then in @code{exec-directory}.  This variable should be
+customized before starting Rmail; if you customize it after starting
+Rmail, you will need to set @code{rmail-movemail-variant-in-use} to the
+@code{nil} value, and then restart Rmail.
 
 @node Remote Mailboxes
 @section Retrieving Mail from Remote Mailboxes
diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index 0d657aea8a1..41b0813707f 100644
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -176,7 +176,10 @@ Its name should end with a slash."
   :group 'rmail)
 
 (defcustom rmail-movemail-program nil
-  "If non-nil, the file name of the `movemail' program."
+  "If non-nil, the file name of the `movemail' program.
+If you customize this after starting Rmail, reset the
+variable `rmail-movemail-variant-in-use' to the nil value,
+and then restart Rmail."
   :group 'rmail-retrieve
   :type '(choice (const nil) string))
 
diff --git a/lisp/progmodes/make-mode.el b/lisp/progmodes/make-mode.el
index 0ae74630cff..782e0168ed8 100644
--- a/lisp/progmodes/make-mode.el
+++ b/lisp/progmodes/make-mode.el
@@ -574,6 +574,7 @@ The function must satisfy this calling convention:
   "C-c RET C-p" #'makefile-makepp-mode
   "M-p"         #'makefile-previous-dependency
   "M-n"         #'makefile-next-dependency
+  "M-q"         #'fill-paragraph
   "C-M-i"       #'completion-at-point)
 
 (when makefile-electric-keys