--- a/suite/browser/browser-prefs.js
+++ b/suite/browser/browser-prefs.js
@@ -542,17 +542,17 @@ pref("app.update.certs.2.issuerName", "C
 pref("app.update.certs.2.commonName", "aus2-community.mozilla.org");
 
 // Interval: Time between checks for a new version (in seconds)
 //           default=1 day
 pref("app.update.interval", 86400);
 // The minimum delay in seconds for the timer to fire.
 // default=2 minutes
 pref("app.update.timerMinimumDelay", 120);
-#ifdef RELEASE_BUILD
+#ifdef RELEASE_OR_BETA
 // Give the user x seconds to react before showing the big UI. default=8 days
 pref("app.update.promptWaitTime", 691200);
 #else
 // For nightly and aurora builds, before showing the big UI, default=12 hrs
 pref("app.update.promptWaitTime", 43200);
 #endif
 // Show the Update Checking/Ready UI when the user was idle for x seconds
 pref("app.update.idletime", 60);

--- a/suite/common/pref/pref-scripts.xul
+++ b/suite/common/pref/pref-scripts.xul
@@ -72,17 +72,17 @@
                   preference="dom.disable_window_status_change"/>
         <listitem type="checkbox" id="allowContextmenuDisable"
                   label="&allowContextmenuDisable.label;"
                   preference="dom.event.contextmenu.enabled"/>
       </listbox>
     </groupbox>
 
     <!-- REMOVE #ifndef once EME are ready for prime time, meta bug 1015800 -->
-#ifndef RELEASE_BUILD
+#ifndef RELEASE_OR_BETA
     <groupbox id="drmPreferences">
       <caption label="&enableDrmMedia.label;"/>
       <checkbox id="emeForSuite"
                 label="&enableEmeForSuite.label;"
                 accesskey="&enableEmeForSuite.accesskey;"
                 preference="media.eme.enabled"/>
     </groupbox>
 #endif