diff --git a/browser/components/preferences/advanced.xul b/browser/components/preferences/advanced.xul
index eecd9305d1a6..02afd5f399d3 100644
--- a/browser/components/preferences/advanced.xul
+++ b/browser/components/preferences/advanced.xul
@@ -95,6 +95,11 @@
       <preference id="security.disable_button.openDeviceManager"
                   name="security.disable_button.openDeviceManager"
                   type="bool"/>
+#ifdef MOZ_SAFE_BROWSING
+      <preference id="browser.safebrowsing.enabled"
+                  name="browser.safebrowsing.enabled"
+                  type="bool"/>
+#endif
     </preferences>
     
     <script type="application/x-javascript" src="chrome://browser/content/preferences/advanced.js"/>
@@ -105,6 +110,9 @@
         <tab label="&generalTab.label;" helpTopic="prefs-advanced-general"/>
         <tab label="&updateTab.label;" helpTopic="prefs-advanced-update"/>
         <tab label="&securityTab.label;" helpTopic="prefs-advanced-security"/>
+#ifdef MOZ_SAFE_BROWSING
+        <tab label="&safeBrowsingTab.label;"/>
+#endif
       </tabs>
       <tabpanels flex="1">
         <tabpanel orient="vertical">
@@ -244,6 +252,16 @@
 #endif
           </groupbox>
         </tabpanel>
+#ifdef MOZ_SAFE_BROWSING
+        <tabpanel orient="vertical">
+          <label id="safe-pref">&safeBrowsing.label;</label>
+          <checkbox id="safe-active"
+                    class="indent"
+                    label="&safeBrowsingEnable.label;"
+                    accesskey="&safeBrowsingEnable.accesskey;"
+                    preference="browser.safebrowsing.enabled"/>
+        </tabpanel>
+#endif
       </tabpanels>
     </tabbox>   
   </prefpane>
diff --git a/browser/locales/en-US/chrome/browser/preferences/advanced.dtd b/browser/locales/en-US/chrome/browser/preferences/advanced.dtd
index fd88ad4c9c51..6b0eedba7bf7 100644
--- a/browser/locales/en-US/chrome/browser/preferences/advanced.dtd
+++ b/browser/locales/en-US/chrome/browser/preferences/advanced.dtd
@@ -59,3 +59,7 @@
 <!ENTITY showLanguages.label            "Edit Languages...">
 <!ENTITY showLanguages.accesskey        "L">
 
+<!ENTITY safeBrowsingTab.label          "Safe Browsing">
+<!ENTITY safeBrowsing.label             "While I'm browsing the internet:">
+<!ENTITY safeBrowsingEnable.label       "Check to see if the site I'm visiting might be a scam">
+<!ENTITY safeBrowsingEnable.accesskey   "o">