diff --git a/build/buildbot/config/common.xml b/build/buildbot/config/common.xml
index 91783015bb..9d3eed6af8 100644
--- a/build/buildbot/config/common.xml
+++ b/build/buildbot/config/common.xml
@@ -64,7 +64,7 @@
 -->
 
 <emaillookup name="wx-devs">
-    <xi:include href="include/wx-devs.xml" xpointer="xpointer(//*[@id='MW'])"/>
+    <xi:include href="include/wx-devs.xml"/>
 </emaillookup>
 
 <!--
diff --git a/build/buildbot/config/include/wx-devs.xml b/build/buildbot/config/include/wx-devs.xml
index e1720955af..4220410024 100644
--- a/build/buildbot/config/include/wx-devs.xml
+++ b/build/buildbot/config/include/wx-devs.xml
@@ -1,38 +1,39 @@
 <?xml version="1.0"?>
 <emaillookup>
+  <email id="ABX">abx -at- abx.art.pl</email>
   <email id="AG">andrea.gavana -at- gmail.com</email>
+  <email id="AMB">alex -at- alex.org.uk</email>
+  <email id="AVV">cafedetal -at- gmail.com</email>
   <email id="BIW">bwilliams -at- kirix.com</email>
   <email id="BP">bryan -at- ibaku.net</email>
   <email id="BY">techrazy.yang -at- gmail.com</email>
   <email id="CE">biol75 -at- york.ac.uk</email>
+  <email id="CHB">Chris.Barker -at- noaa.gov</email>
   <email id="CJP">admin -at- editra.org</email>
   <email id="DE">dfe -at- cox.net</email>
+  <email id="DJL">daniel.lauk -at- gmail.com</email>
+  <email id="DMS">diaasami -at- gmail.com</email>
+  <email id="DS">d.schoolwerth -at- xs4all.nl</email>
   <email id="FM">f18m_cpp217828 -at- yahoo.it</email>
   <email id="FT">frank.tobia -at- gmail.com</email>
+  <email id="GD">gilles_depeyrot -at- mac.com</email>
   <email id="JG">jrgadd2 -at- cs.latrobe.edu.au</email>
   <email id="JJ">joukj -at- hrem.nano.tudelft.nl</email>
   <email id="JS">julian -at- anthemion.co.uk</email>
   <email id="JW">hc.john -at- gmail.com</email>
+  <email id="KH">hockkn -at- yahoo.com</email>
+  <email id="KLB">KendallB -at- scitechsoft.com</email>
   <email id="KO">kevino -at- theolliviers.com</email>
   <email id="MBN">mbarbon -at- cpan.org</email>
   <email id="MR">leio -at- gentoo.org</email>
   <email id="MW">mike.wetherell -at- ntlworld.com</email>
   <email id="PC">paulcor -at- bullseye.com</email>
   <email id="RD">robin -at- alldunn.com</email>
+  <email id="RN">wxprojects -at- comcast.net</email>
   <email id="ROL">rolinsky -at- femagsoft.com</email>
   <email id="RR">robert -at- roebling.de</email>
   <email id="SC">csomor -at- advancedconcepts.ch</email>
   <email id="SN">Stefan.Neis -at- t-online.de</email>
   <email id="VS">vslavik -at- fastmail.fm</email>
   <email id="VZ">vadim -at- wxwidgets.org</email>
-  <email id="ABX">abx -at- abx.art.pl</email>
-  <email id="AMB">alex -at- alex.org.uk</email>
-  <email id="AVV">cafedetal -at- gmail.com</email>
-  <email id="DJL">daniel.lauk -at- gmail.com</email>
-  <email id="DMS">diaasami -at- gmail.com</email>
-  <email id="DS">d.schoolwerth -at- xs4all.nl</email>
-  <email id="GD">gilles_depeyrot -at- mac.com</email>
-  <email id="KH">hockkn -at- yahoo.com</email>
-  <email id="KLB">KendallB -at- scitechsoft.com</email>
-  <email id="RN">wxprojects -at- comcast.net</email>
 </emaillookup>
diff --git a/build/buildbot/tools/email.xsl b/build/buildbot/tools/email.xsl
index 68351fd6fc..7e4c7c381e 100644
--- a/build/buildbot/tools/email.xsl
+++ b/build/buildbot/tools/email.xsl
@@ -20,7 +20,9 @@
 
 <xsl:template match="/">
     <emaillookup>
-        <xsl:apply-templates select="//table/tr"/>
+        <xsl:apply-templates select="//table/tr">
+            <xsl:sort select="normalize-space(td[1])"/>
+        </xsl:apply-templates>
     </emaillookup>
 </xsl:template>