diff --git a/config.js b/config.js
index 613c7eed76..ba3c1495a9 100644
--- a/config.js
+++ b/config.js
@@ -31,7 +31,7 @@ var config = {
     enableRecording: false,
     enableWelcomePage: true,
     enableSimulcast: false,
-    enableFirefoxSupport: false, //firefox support is still experimental, only one-to-one conferences with chrome focus
-    // will work when simulcast, bundle, mux, lastN and SCTP are disabled.
+    enableFirefoxSupport: true, //firefox support is still experimental and
+    // will work when simulcast is *disabled* and rtcpMux & bundle are *enabled*.
     logStats: false // Enable logging of PeerConnection stats via the focus
 };
diff --git a/css/unsupported_browser.css b/css/unsupported_browser.css
index 432933ae66..75ac83c0f4 100644
--- a/css/unsupported_browser.css
+++ b/css/unsupported_browser.css
@@ -62,7 +62,7 @@ a {
 .supported_browsers
 {
     margin: 0px auto 0px auto;
-    width: 460px;
+    width: 660px;
 }
 
 .clear
@@ -101,6 +101,13 @@ a {
     height: 79px;
     background-image: url('/images/chromium.png');
 }
+#firefox-nightly_logo
+{
+    width: 73px;
+    height: 79px;
+    background-image: url('/images/firefox-nightly.png');
+}
+
 #opera_logo
 {
     width: 73px;
diff --git a/images/firefox-nightly.png b/images/firefox-nightly.png
new file mode 100644
index 0000000000..6946696240
Binary files /dev/null and b/images/firefox-nightly.png differ
diff --git a/unsupported_browser.html b/unsupported_browser.html
index c8f7ff01ee..88d893e550 100644
--- a/unsupported_browser.html
+++ b/unsupported_browser.html
@@ -32,6 +32,13 @@
                 <a href="http://www.opera.com"><div class="button">DOWNLOAD</div></a>
             </div>
         </div>
+        <div class="browser_wrapper">
+            Firefox Nightly
+            <div class="browser">
+                <div class="logo" id="firefox-nightly_logo"></div>
+                <a href="https://nightly.mozilla.org/"><div class="button">DOWNLOAD</div></a>
+            </div>
+        </div>
     </div>
     <div class="clear"></div>
     <div class="firefox">We are hoping that multistream support for Firefox would not be long so that we could all use this application with our favorite browser.</div>