2 files changed, 5 insertions, 4 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9603acec917..f57bd437af6 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,9 @@
 2011-08-17  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
+        * mail/smtpmail.el (auth-source): Require to avoid problems with
+        binding variables (bug#9298).  Also clean up some unused
+        autoloads.
+
         * net/network-stream.el (network-stream-open-starttls): Support
         using starttls.el without using gnutls-cli.
 
diff --git a/lisp/mail/smtpmail.el b/lisp/mail/smtpmail.el
index 3b406fa9331..637d10135fa 100644
--- a/lisp/mail/smtpmail.el
+++ b/lisp/mail/smtpmail.el
@@ -55,15 +55,12 @@
 ;;; Code:
 
 (require 'sendmail)
+(require 'auth-source)
 (autoload 'mail-strip-quoted-names "mail-utils")
 (autoload 'message-make-date "message")
 (autoload 'message-make-message-id "message")
 (autoload 'rfc2104-hash "rfc2104")
-(autoload 'netrc-parse "netrc")
-(autoload 'netrc-machine "netrc")
-(autoload 'netrc-get "netrc")
 (autoload 'password-read "password-cache")
-(autoload 'auth-source-search "auth-source")
 
 ;;;
 (defgroup smtpmail nil