diff --git a/mail/base/content/credits.xhtml b/mail/base/content/credits.xhtml
index 77b74e5a60db..7cd4956847df 100644
--- a/mail/base/content/credits.xhtml
+++ b/mail/base/content/credits.xhtml
@@ -217,10 +217,9 @@
               <li>Mike Cowperthwaite</li>
               <li>Asa Dotzler</li>
               <li>Marcia Knous</li>
-              <li>Sarah Liberman</li>
               <li>MozillaZine Community</li>
               <li>Jay Patel</li>
-              <li>Trix Supremo</li>
+              <li>Tim Riley</li>
               <li>Tracy Walker</li>
             </ul>
           </div>
@@ -228,8 +227,9 @@
           <h3>&credit.build;</h3>
           <div class="credit">
           <ul>
-            <li>Chris Cooper</li>
-            <li>Chase Phillips</li>
+            <li>T.R. Fullhart</li>
+            <li>Rob Helmer</li>
+            <li>Paul Reed</li>
           </ul>
           </div>
         </div>
@@ -244,38 +244,68 @@
             <li>Zbigniew Braniecki</li>
             <li>Christopher Beard</li>
             <li>Stefan Borggraefe</li>
+            <li>Daniel Burka</li>
+            <li>Mary Colvig</li>
+            <li>Chris Cooper</li>            
             <li>Don Crandall</li>
             <li>André Dahlqvist</li>
+            <li>Bart Decrem</li>            
+            <li>Stephen Desroches</li>
+            <li>Gordon Dickens</li>
+            <li>Sherman Dickman</li>
+            <li>Karsten Düsterloh</li>
+            <li>Rafael Ebron</li>            
             <li>Brendan Eich</li>
+            <li>Kai Engert</li>
             <li>Christian Eyrich</li>
             <li>Darin Fisher</li>
+            <li>Steven Garrity</li>
             <li>Ben Goodger</li>
+            <li>Adam Guthrie</li>
+            <li>Jasper Hauser</li>
+            <li>Axel Hecht</li>
+            <li>Jon Hicks</li>
+            <li>Chris Hofmann</li>
+            <li>Alexander Ihrig</li>
             <li>Blake Kaplan</li> 
             <li>Jason Kersey</li>
             <li>Gary Kwong</li>
-            <li>Myk Melez</li>         
-            <li>Dan Mosedale</li>         
-            <li>Ian Neal</li>         
+            <li>Sarah Liberman</li>
+            <li>Gerv Markham</li>
+            <li>Myk Melez</li>
+            <li>Magnus Melin</li>
+            <li>Wayne Mery</li>
+            <li>Dave Miller</li>            
+            <li>Dan Mosedale</li>
+            <li>Masayuki Nakano</li>
+            <li>Ian Neal</li>
+            <li>Chase Phillips</li>
             <li>Neil Rashbrook</li>
             <li>Robert Sayre</li>
             <li>Asaf Romano</li>
             <li>Brian Ryner</li>
+            <li>Žiga Sancin</li>
+            <li>Gavin Sharp</li>
             <li>silverorange</li>
+            <li>Eric Shepherd</li>
             <li>Jungshik Shin</li>
+            <li>Jonas Sicking</li>
             <li>Benjamin Smedberg</li>
             <li>Seth Spitzer</li>
             <li>Johnny Stenback</li>
+            <li>Robert Strong</li>
+            <li>Trix Supremo</li>
+            <li>Satoko Takita</li>
             <li>David Tenser</li>
+            <li>Dan Veditz</li>
             <li>Stephen Walker</li>
             <li>Simon Wilkinson</li>
+            <li>Kohei Yoshino</li>
           </ul>
           </div>
 
           &credit.translation;
-
-          <h3>&credit.visuals;</h3>
-          <div class="credit">Steven Garrity</div>
-          
+         
           <h3>&credit.theme;</h3>
           <div class="credit">
           <ul>
@@ -285,27 +315,6 @@
           </ul>
           </div>
           
-          <h3>&credit.brand;</h3>
-          <div class="credit">
-          <ul>
-            <li>Daniel Burka</li>
-            <li>Stephen Desroches</li>
-            <li>Jasper Hauser</li>
-            <li>Jon Hicks</li>
-          </ul>
-          </div>
-          
-          <h3>&credit.web;</h3>
-          <div class="credit">Dave Shea</div>
-          
-          <h3>&credit.infra;</h3>
-          <div class="credit">
-          <ul>
-            <li>Myk Melez</li>
-            <li>Dave Miller</li>
-          </ul>
-          </div>
-          
           <h3>&credit.thanks;</h3>
           <div class="credit">
           <ul>
@@ -316,25 +325,6 @@
           </div>
         </div>
         
-        <div class="creditsGroup">
-          <h3>&credit.manage;</h3>
-          <div class="credit">
-          <ul>
-            <li>David Bienvenu</li>
-            <li>Chris Hofmann</li>
-            <li>Scott MacGregor</li>
-          </ul>
-          </div>
-            
-          <h3>&credit.market;</h3>
-          <div class="credit">
-          <ul>
-            <li>Bart Decrem</li>
-            <li>Rafael Ebron</li>
-          </ul>
-          </div>
-        </div>
-
         <p id="gecko" class="center">&credit.poweredByGecko;</p>
 
         <p class="footnote">