diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 277d94bfd35..30a198979f2 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,6 +1,7 @@
 2008-08-21  Glenn Morris  <rgm@gnu.org>
 
 	* fortran-xtra.texi (Fortran Columns): Document `fortran-line-length'.
+	(Fortran Comments): Replace fortran-indent-comment with comment-dwim.
 
 2008-08-17  Chong Yidong  <cyd@stupidchicken.com>
 
diff --git a/doc/emacs/fortran-xtra.texi b/doc/emacs/fortran-xtra.texi
index 3a46837ab9c..14c2392cba2 100644
--- a/doc/emacs/fortran-xtra.texi
+++ b/doc/emacs/fortran-xtra.texi
@@ -336,7 +336,7 @@ unless you have said in advance to do so.  To do this, set the variable
 
 @table @kbd
 @item M-;
-Align comment or insert new comment (@code{fortran-indent-comment}).
+Align comment or insert new comment (@code{comment-dwim}).
 
 @item C-x ;
 Applies to nonstandard @samp{!} comments only.
@@ -346,13 +346,11 @@ Turn all lines of the region into comments, or (with argument) turn them back
 into real code (@code{fortran-comment-region}).
 @end table
 
-@findex fortran-indent-comment
-  @kbd{M-;} in Fortran mode is redefined as the command
-@code{fortran-indent-comment}.  Like the usual @kbd{M-;} command, this
-recognizes any kind of existing comment and aligns its text appropriately;
-if there is no existing comment, a comment is inserted and aligned.  But
-inserting and aligning comments are not the same in Fortran mode as in
-other modes.
+  @kbd{M-;} in Fortran mode runs the standard @code{comment-dwim}.
+This recognizes any kind of existing comment and aligns its text
+appropriately; if there is no existing comment, a comment is inserted
+and aligned.  Inserting and aligning comments are not the same in
+Fortran mode as in other modes.
 
   When a new comment must be inserted, if the current line is blank, a
 full-line comment is inserted.  On a non-blank line, a nonstandard @samp{!}
diff --git a/etc/NEWS b/etc/NEWS
index 0721d00b23e..298a4f06b3b 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -814,6 +814,7 @@ including `dired-do-query-replace-regexp', `vc-dir-query-replace-regexp',
 *** The line length of fixed-form Fortran is not fixed at 72 any more.
 Customize the variable `fortran-line-length' to change it.
 
++++
 *** In Fortran mode, M-; is now bound to the standard comment-dwim,
 rather than fortran-indent-comment.
 
@@ -1119,6 +1120,7 @@ coding-system used for decoding.  The functions
 `process-filter-multibyte-p' and `set-process-filter-multibyte' are
 obsolete.
 
+---
 ** The variable `byte-compile-warnings' can now be a list starting with `not',
 meaning to disable the specified warnings.  The meaning of this list
 may therefore be the reverse of what you expect (of course, this is
@@ -1208,6 +1210,7 @@ IDENTIFICATION specifies which part of the remote identifier has to be
 returned.  With CONNECTED passed non-nil, it is checked whether a
 remote connection has been established already.
 
++++
 ** The new macro `declare-function' suppresses compiler warnings about
 undefined functions.
 
@@ -1633,6 +1636,7 @@ certain variable as having been made within Custom.
 
 ** The new package avl-tree.el deals with the AVL tree data structure.
 
++++
 ** The new package check-declare.el verifies the accuracy of
 declare-function macros (see Lisp Changes, above).