diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog
index dd62cae7de1..27b1fe8617a 100644
--- a/lisp/erc/ChangeLog
+++ b/lisp/erc/ChangeLog
@@ -1,3 +1,9 @@
+2012-08-21  Julien Danjou  <julien@danjou.info>
+
+	* erc-match.el (erc-match-message): Use
+	`erc-match-exclude-server-buffer' not
+	`erc-track-exclude-server-buffer'.
+
 2012-08-20  Josh Feinstein <jlf@foxtail.org>
 
 	* erc.el (erc-display-message): Abstract message hiding decision
diff --git a/lisp/erc/erc-match.el b/lisp/erc/erc-match.el
index 8daf9be2b14..cac042c0298 100644
--- a/lisp/erc/erc-match.el
+++ b/lisp/erc/erc-match.el
@@ -458,7 +458,7 @@ Use this defun with `erc-insert-modify-hook'."
 				      (point-min))
 				    (point-max))))
     (when (and vector
-	       (not (and erc-track-exclude-server-buffer
+	       (not (and erc-match-exclude-server-buffer
 			 (erc-server-buffer-p))))
       (mapc
        (lambda (match-type)