diff --git a/mozilla/webtools/aus/xml/inc/config-dist.php b/mozilla/webtools/aus/xml/inc/config-dist.php
index 37963462882..e914a86eef6 100644
--- a/mozilla/webtools/aus/xml/inc/config-dist.php
+++ b/mozilla/webtools/aus/xml/inc/config-dist.php
@@ -129,13 +129,8 @@ $nightlyChannels = array(
 // @todo replace this with a better datasource that can be easily managed via a GUI.
 $productBranchVersions = array(
     'Firefox'     =>  array(
-        '2.0*'    =>  '2.0',
-        '3.0*'   =>  'trunk',
-        '3.1*'    => 'mozilla-1.9.1',
         '3.5*'    => 'mozilla-1.9.1',
-        '3.6*plugin*' => 'firefox-lorentz',
         '3.6*'    => 'mozilla-1.9.2',
-        '3.2*'    => 'mozilla-central',
         '3.7*'    => array(
            'nightly'                 => 'mozilla-central',
            'nightly-tracemonkey'     => 'tracemonkey',
@@ -145,6 +140,11 @@ $productBranchVersions = array(
            'nightly'                 => 'mozilla-central',
            'nightly-tracemonkey'     => 'tracemonkey',
            'nightly-electrolysis'    => 'electrolysis'
+        ),
+        '4.2*'    => array(
+           'nightly'                 => 'mozilla-central',
+           'nightly-tracemonkey'     => 'tracemonkey',
+           'nightly-electrolysis'    => 'electrolysis'
         )
     ),
     'Thunderbird' =>  array(