diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a600fd5870c..69688ad0ff4 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2004-05-28  Simon Josefsson  <jas@extundo.com>
+
+	* mail/smtpmail.el (smtpmail-open-stream): Bind
+	starttls-extra-arguments too, if starttls.el uses GNUTLS.
+
 2004-05-26  Simon Josefsson  <jas@extundo.com>
 
 	* starttls.el: Merge with my GNUTLS based starttls.el.
diff --git a/man/ChangeLog b/man/ChangeLog
index 79e182636f1..ffd8bae6a2e 100644
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,3 +1,7 @@
+2004-05-28  Simon Josefsson  <jas@extundo.com>
+
+	* smtpmail.texi (Authentication): Improve STARTTLS discussion.
+
 2004-05-27  Luc Teirlinck  <teirllm@auburn.edu>
 
 	* dired.texi (Dired and Find): `find-ls-option' does not apply to