diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7fb9f323950..f247abdd468 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -3,6 +3,7 @@
 	* mail/smtpmail.el (smtpmail-via-smtp): Only bind
 	`coding-system-for-*' around the process open call to avoid
 	auth-source side effects.
+	(smtpmail-try-auth-methods): Expand the secret password.
 
 2011-08-21  Chong Yidong  <cyd@stupidchicken.com>
 
diff --git a/lisp/mail/smtpmail.el b/lisp/mail/smtpmail.el
index 381af3b963a..f905eea8405 100644
--- a/lisp/mail/smtpmail.el
+++ b/lisp/mail/smtpmail.el
@@ -505,6 +505,8 @@ The list is in preference order.")
 	 (save-function (and ask-for-password
 			     (plist-get auth-info :save-function)))
 	 ret)
+    (when (functionp password)
+      (setq password (funcall password)))
     (when (and user
 	       (not password))
       ;; The user has stored the user name, but not the password, so