diff --git a/man/ChangeLog b/man/ChangeLog
index bcf35636f63..cdf74ffa064 100644
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,3 +1,9 @@
+2003-04-23  Simon Josefsson  <jas@extundo.com>
+
+	* smtpmail.texi: Fix license (the invariant sections mentioned has
+	never been part of the smtp manual).  Align info dir entry with
+	other emacs packages.
+
 2003-04-16  Richard M. Stallman  <rms@gnu.org>
 
 	* search.texi (Regexps): Ref to Lisp manual for more regexp features.
diff --git a/man/smtpmail.texi b/man/smtpmail.texi
index 64c7180c01c..05c99ed3724 100644
--- a/man/smtpmail.texi
+++ b/man/smtpmail.texi
@@ -8,12 +8,11 @@ Copyright @copyright{} 2003 Free Software Foundation, Inc.
 @quotation
 Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.1 or
-any later version published by the Free Software Foundation; with the
-Invariant Sections being ``The GNU Manifesto'', ``Distribution'' and
-``GNU GENERAL PUBLIC LICENSE'', with the Front-Cover texts being ``A GNU
-Manual'', and with the Back-Cover Texts as in (a) below.  A copy of the
-license is included in the section entitled ``GNU Free Documentation
-License'' in the Emacs manual.
+any later version published by the Free Software Foundation; with no
+Invariant Sections, with the Front-Cover texts being ``A GNU Manual'',
+and with the Back-Cover Texts as in (a) below.  A copy of the license
+is included in the section entitled ``GNU Free Documentation License''
+in the Emacs manual.
 
 (a) The FSF's Back-Cover Text is: ``You have freedom to copy and modify
 this GNU Manual, like GNU software.  Copies published by the Free
@@ -28,7 +27,7 @@ license to the document, as described in section 6 of the license.
 
 @dircategory Emacs
 @direntry
-* Emacs SMTP Library: (smtpmail). Emacs library for sending mail via SMTP.
+* SMTP: (smtpmail). Emacs library for sending mail via SMTP.
 @end direntry
 
 @titlepage