diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a924bbd9f9589f6c1de7a6111e549b585fc0bfb5..5e712f5ded8841b28245d93d3ff4989e5c16c3e0 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,25 @@
+2003-05-23  Lute Kamstra  <Lute.Kamstra@cwi.nl>
+
+	* emacs-lisp/lisp-mnt.el: Make the description of the library more
+	accurate.
+	(lm-any-header): New user option.
+	(lm-section-start): New function; rewrite of `lm-section-mark'.
+	(lm-section-mark): Make alias of `lm-section-start'.
+	(lm-section-end): New function.
+	(lm-code-start): New function; rewrite of `lm-code-mark'.
+	(lm-code-mark): Make alias of `lm-code-start'.
+	(lm-commentary-start): New function; rewrite of
+	`lm-commentary-mark'.
+	(lm-commentary-mark): Make alias of `lm-commentary-start'.
+	(lm-commentary-end): New function.
+	(lm-history-start): New function; rewrite of `lm-history-mark'.
+	(lm-history-mark): Make alias of `lm-history-start'.
+	(lm-commentary): Use `lm-commentary-end' to find the end of the
+	commentary section.
+
+	* emacs-lisp/checkdoc.el (checkdoc-file-comments-engine): Use
+	`lm-commentary-end' to find the end of the commentary section.
+
 2003-05-22  Ken Stevens <kstevens@ichips.intel.com>
 
 	* ispell.el: Sync to version 3.6.
diff --git a/lisp/emacs-lisp/checkdoc.el b/lisp/emacs-lisp/checkdoc.el
index f9d1cacdc25423e0a91b9c1ee21b68501f91be01..a5fb3cede5e3c4bd31a502ced7d30ffb0d3c0c22 100644
--- a/lisp/emacs-lisp/checkdoc.el
+++ b/lisp/emacs-lisp/checkdoc.el
@@ -2346,22 +2346,16 @@ Code:, and others referenced in the style guide."
       ;; section that is easy to pick out, and it is also the most
       ;; visible section (with the finder).
       (let ((cm (lm-commentary-mark)))
-	(if cm
-	    (save-excursion
-	      (goto-char (lm-commentary-mark))
-	      ;; Spellcheck between the commentary, and the first
-	      ;; non-comment line.  We could use lm-commentary, but that
-	      ;; returns a string, and Ispell wants to talk to a buffer.
-	      ;; Since the comments talk about Lisp, use the specialized
-	      ;; spell-checker we also used for doc strings.
-	      (let ((e (save-excursion (re-search-forward "^[^;]" nil t)
-				       (point))))
-		(checkdoc-sentencespace-region-engine (point) e)
-		(checkdoc-proper-noun-region-engine (point) e)
-		(checkdoc-ispell-docstring-engine e)))))
-;;; test comment out code
-;;;       (foo 1 3)
-;;;       (bar 5 7)
+        (when cm
+          (save-excursion
+            (goto-char cm)
+            (let ((e (copy-marker (lm-commentary-end))))
+              ;; Since the comments talk about Lisp, use the
+              ;; specialized spell-checker we also used for doc
+              ;; strings.
+              (checkdoc-sentencespace-region-engine (point) e)
+              (checkdoc-proper-noun-region-engine (point) e)
+              (checkdoc-ispell-docstring-engine e)))))
       (setq
        err
        (or