diff --git a/mozilla/webtools/aus/xml/inc/config-dist.php b/mozilla/webtools/aus/xml/inc/config-dist.php
index eabc44ab31a..a670c652c49 100644
--- a/mozilla/webtools/aus/xml/inc/config-dist.php
+++ b/mozilla/webtools/aus/xml/inc/config-dist.php
@@ -87,10 +87,26 @@ define('THROTTLE_LOGGING',false);
 // );
 $productThrottling = array(
      'Firefox' => array(
-         '3.5.20' => 0,
-         '3.6.19' => 0,
-         '4.0' => 33,
-         '4.0.1' => 33
+         // Completely throttled at the request of release-drivers, currently
+         // pointing at 5.0
+         '3.6.2' => 0,
+         '3.6.3' => 0,
+         '3.6.4' => 0,
+         '3.6.6' => 0,
+         '3.6.7' => 0,
+         '3.6.8' => 0,
+         '3.6.9' => 0,
+         '3.6.10' => 0,
+         '3.6.11' => 0,
+         '3.6.12' => 0,
+         '3.6.13' => 0,
+         '3.6.14' => 0,
+         '3.6.15' => 0,
+         '3.6.16' => 0,
+         '3.6.17' => 0,
+         '3.6.18' => 0,
+         // Upcoming version of 3.6, whose MUs we want throttled out of the gate.
+         '3.6.19' => 0
      )
 );
 
@@ -107,21 +123,73 @@ $productThrottling = array(
 // In this example, 3.0.11 with channel names that match these channels will not
 // be throttled unless there is a global throttle enabled.
 $throttleExceptions = array(
-    '3.5.20' => array (
+    '3.6.2' => array (
+        'betatest',
+        'releasetest'
+    ),
+    '3.6.3' => array (
+        'betatest',
+        'releasetest'
+    ),
+    '3.6.4' => array (
+        'betatest',
+        'releasetest'
+    ),
+    '3.6.6' => array (
+        'betatest',
+        'releasetest'
+    ),
+    '3.6.7' => array (
+        'betatest',
+        'releasetest'
+    ),
+    '3.6.8' => array (
+        'betatest',
+        'releasetest'
+    ),
+    '3.6.9' => array (
+        'betatest',
+        'releasetest'
+    ),
+    '3.6.10' => array (
+        'betatest',
+        'releasetest'
+    ),
+    '3.6.11' => array (
+        'betatest',
+        'releasetest'
+    ),
+    '3.6.12' => array (
+        'betatest',
+        'releasetest'
+    ),
+    '3.6.13' => array (
+        'betatest',
+        'releasetest'
+    ),
+    '3.6.14' => array (
+        'betatest',
+        'releasetest'
+    ),
+    '3.6.15' => array (
+        'betatest',
+        'releasetest'
+    ),
+    '3.6.16' => array (
+        'betatest',
+        'releasetest'
+    ),
+    '3.6.17' => array (
+        'betatest',
+        'releasetest'
+    ),
+    '3.6.18' => array (
         'betatest',
         'releasetest'
     ),
     '3.6.19' => array (
         'betatest',
         'releasetest'
-    ),
-    '4.0' => array (
-        'betatest',
-        'releasetest'
-    ),
-    '4.0.1' => array (
-        'betatest',
-        'releasetest'
     )
 );