diff --git a/default.properties b/default.properties
index 23e0475..beded0e 100644
--- a/default.properties
+++ b/default.properties
@@ -1,4 +1,4 @@
-selenium.version = 2.20.0
+selenium.version = 2.21.0
 production.hostnames.regex = qa(\-selenium[0-9]*\.mv\.mozilla\.com|[0-9]*\-\w+)
 nonaddressable.hostnames.regex = qa[0-9]*\-\w+
 production.hub.host = qa-selenium.mv.mozilla.com
diff --git a/grid_configuration.yml b/grid_configuration.yml
index 362ba9e..3432f7b 100644
--- a/grid_configuration.yml
+++ b/grid_configuration.yml
@@ -10,6 +10,8 @@ hub:
          browser: "*firefox /Applications/Firefox 9.app/Contents/MacOS/firefox-bin"
        - name: "Firefox 10 on Mac OS X"
          browser: "*firefox /Applications/Firefox 10.app/Contents/MacOS/firefox-bin"
+       - name: "Firefox 11 on Mac OS X"
+         browser: "*firefox /Applications/Firefox 11.app/Contents/MacOS/firefox-bin"
        - name: "Firefox Beta on Mac OS X"
          browser: "*firefox /Applications/Firefox Beta.app/Contents/MacOS/firefox-bin"
        - name: "Firefox Aurora on Mac OS X"
@@ -26,6 +28,8 @@ hub:
          browser: "*firefox C:/Program Files/Mozilla Firefox 9/firefox.exe"
        - name: "Firefox 10 on Windows Vista"
          browser: "*firefox C:/Program Files/Mozilla Firefox 10/firefox.exe"
+       - name: "Firefox 11 on Windows Vista"
+         browser: "*firefox C:/Program Files/Mozilla Firefox 11/firefox.exe"
        - name: "Firefox Beta on Windows Vista"
          browser: "*firefox C:/Program Files/Mozilla Firefox Beta/firefox.exe"
        - name: "Firefox Aurora on Windows Vista"
@@ -46,6 +50,8 @@ hub:
          browser: "*firefox C:/Program Files/Mozilla Firefox 9/firefox.exe"
        - name: "Firefox 10 on Windows 7"
          browser: "*firefox C:/Program Files/Mozilla Firefox 10/firefox.exe"
+       - name: "Firefox 11 on Windows 7"
+         browser: "*firefox C:/Program Files/Mozilla Firefox 11/firefox.exe"         
        - name: "Firefox Beta on Windows 7"
          browser: "*firefox C:/Program Files/Mozilla Firefox Beta/firefox.exe"
        - name: "Firefox Aurora on Windows 7"
diff --git a/hub_configuration.json b/hub_configuration.json
index 3e6f610..fdc7a01 100644
--- a/hub_configuration.json
+++ b/hub_configuration.json
@@ -1,3 +1,4 @@
 {
-    "timeout": 180000
+    "timeout": 30000,
+    "browserTimeout": 180000
 }
diff --git a/mac.json b/mac.json
index 621d0b3..9ae616d 100644
--- a/mac.json
+++ b/mac.json
@@ -21,6 +21,10 @@
                 "browserName": "Firefox 10 on Mac OS X",
                 "maxInstances": 5,
                 "seleniumProtocol": "Selenium"
+            }, {
+                "browserName": "Firefox 11 on Mac OS X",
+                "maxInstances": 5,
+                "seleniumProtocol": "Selenium"
             }, {
                 "browserName": "Firefox Beta on Mac OS X",
                 "maxInstances": 5,
@@ -68,6 +72,13 @@
                 "platform": "MAC",
                 "maxInstances": 1,
                 "seleniumProtocol": "WebDriver"
+            }, {
+                "browserName": "firefox",
+                "version": "11",
+                "firefox_binary": "/Applications/Firefox 11.app/Contents/MacOS/firefox-bin",
+                "platform": "MAC",
+                "maxInstances": 1,
+                "seleniumProtocol": "WebDriver"
             }, {
                 "browserName": "firefox",
                 "version": "beta",
@@ -91,7 +102,5 @@
                 "seleniumProtocol": "WebDriver"
             }
         ],
-    "configuration": {
-        "timeout": 180000
-    }
+    "configuration": {}
 }
diff --git a/win7.json b/win7.json
index 2edf78a..5d2817d 100644
--- a/win7.json
+++ b/win7.json
@@ -21,6 +21,10 @@
                 "browserName": "Firefox 10 on Windows 7",
                 "maxInstances": 5,
                 "seleniumProtocol": "Selenium"
+            }, {
+                "browserName": "Firefox 11 on Windows 7",
+                "maxInstances": 5,
+                "seleniumProtocol": "Selenium"
             }, {
                 "browserName": "Firefox Beta on Windows 7",
                 "maxInstances": 5,
@@ -72,6 +76,13 @@
                 "platform": "WINDOWS",
                 "maxInstances": 1,
                 "seleniumProtocol": "WebDriver"
+            }, {
+                "browserName": "firefox",
+                "version": "11",
+                "firefox_binary": "C:/Program Files/Mozilla Firefox 11/firefox.exe",
+                "platform": "WINDOWS",
+                "maxInstances": 1,
+                "seleniumProtocol": "WebDriver"
             }, {
                 "browserName": "firefox",
                 "version": "beta",
@@ -101,7 +112,5 @@
                 "seleniumProtocol": "WebDriver"
             }
         ],
-    "configuration": {
-        "timeout": 180000
-    }
+    "configuration": {}
 }
diff --git a/winvista.json b/winvista.json
index 100d9af..3b2370b 100644
--- a/winvista.json
+++ b/winvista.json
@@ -21,6 +21,10 @@
                 "browserName": "Firefox 10 on Windows Vista",
                 "maxInstances": 5,
                 "seleniumProtocol": "Selenium"
+            }, {
+                "browserName": "Firefox 11 on Windows Vista",
+                "maxInstances": 5,
+                "seleniumProtocol": "Selenium"
             }, {
                 "browserName": "Firefox Beta on Windows Vista",
                 "maxInstances": 5,
@@ -72,6 +76,13 @@
                 "platform": "WINDOWS",
                 "maxInstances": 1,
                 "seleniumProtocol": "WebDriver"
+            }, {
+                "browserName": "firefox",
+                "version": "11",
+                "firefox_binary": "C:/Program Files/Mozilla Firefox 11/firefox.exe",
+                "platform": "WINDOWS",
+                "maxInstances": 1,
+                "seleniumProtocol": "WebDriver"
             }, {
                 "browserName": "firefox",
                 "version": "beta",
@@ -101,7 +112,5 @@
                 "seleniumProtocol": "WebDriver"
             }
         ],
-    "configuration": {
-        "timeout": 180000
-    }
+    "configuration": {}
 }