2 files changed, 5 insertions, 2 deletions

diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog
index fae45a2baba..bd20dfbed45 100644
--- a/lisp/erc/ChangeLog
+++ b/lisp/erc/ChangeLog
@@ -3,8 +3,8 @@
         * erc-backend.el (erc-server-send-ping): Move after definition of
         erc-server-send.
 
-        * erc.el (iswitchb-temp-buflist, iswitchb-read-buffer): Declare
-        for compiler.
+        * erc.el (iswitchb-temp-buflist, iswitchb-read-buffer)
+        (erc-controls-strip): Declare for compiler.
         (erc-iswitchb): Don't require iswitchb when compiling.  Test
         iswitchb-mode is bound.
 
diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el
index e52392d0337..e4e9268bfbe 100644
--- a/lisp/erc/erc.el
+++ b/lisp/erc/erc.el
@@ -5964,6 +5964,9 @@ if `erc-away' is non-nil."
     (cond (lag (format "lag:%.0f" lag))
           (t ""))))
 
+;; erc-goodies is required at end of this file.
+(declare-function erc-controls-strip "erc-goodies" (str))
+
 (defun erc-update-mode-line-buffer (buffer)
   "Update the mode line in a single ERC buffer BUFFER."
   (with-current-buffer buffer