2 files changed, 5 insertions, 2 deletions

diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog
index bb8dadbbfcd..ba9dd70e88a 100644
--- a/lisp/erc/ChangeLog
+++ b/lisp/erc/ChangeLog
@@ -1,3 +1,7 @@
+2012-10-28  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * erc-backend.el: Only require `erc' during compilation (bug#12486).
+
 2012-10-18  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * erc-backend.el: Require `erc' instead of autoloading its macros
diff --git a/lisp/erc/erc-backend.el b/lisp/erc/erc-backend.el
index 858a6bd8e82..90b96d7c763 100644
--- a/lisp/erc/erc-backend.el
+++ b/lisp/erc/erc-backend.el
@@ -102,8 +102,7 @@
 ;; There's a fairly strong mutual dependency between erc.el and erc-backend.el.
 ;; Luckily, erc.el does not need erc-backend.el for macroexpansion whereas the
 ;; reverse is true:
-(provide 'erc-backend)
-(require 'erc)
+(eval-when-compile (provide 'erc-backend) (require 'erc))
 
 ;;;; Variables and options