diff --git a/build/buildbot/config/common.xml b/build/buildbot/config/common.xml
index 57facf554f..624911f292 100644
--- a/build/buildbot/config/common.xml
+++ b/build/buildbot/config/common.xml
@@ -88,10 +88,21 @@
 
 <!--
     Map SVN user ids to email addresses.
+
+    The email address in wx-devs.xml can be overridden by adding a line like
+    this after the xi:include:
+
+        <email id="JMS">jaakko.salli -at- dnainternet.net</email>
+
+    or disabled using an empty tag:
+
+        <email id="JMS"/>
 -->
 
 <emaillookup name="wx-devs">
     <xi:include href="include/wx-devs.xml"/>
+    <!-- Overrides... -->
+    <email id="JMS">jaakko.salli -at- dnainternet.net</email>
 </emaillookup>
 
 <!--