diff --git a/modules/libpref/src/init/all.js b/modules/libpref/src/init/all.js
index e8fc9e308b61..0145bf589a7f 100644
--- a/modules/libpref/src/init/all.js
+++ b/modules/libpref/src/init/all.js
@@ -96,6 +96,7 @@ pref("editor.new_find", false);  // temporary
 pref("browser.urlbar.autoFill", false);
 pref("browser.urlbar.showPopup", true);
 pref("browser.urlbar.showSearch", true);
+pref("browser.urlbar.matchOnlyTyped", false);
 
 pref("browser.chrome.site_icons", true);
 pref("browser.chrome.favicons", false);
diff --git a/xpfe/components/prefwindow/resources/content/pref-smart_browsing-ac.xul b/xpfe/components/prefwindow/resources/content/pref-smart_browsing-ac.xul
index 1692b16b7118..262f5e8264c5 100644
--- a/xpfe/components/prefwindow/resources/content/pref-smart_browsing-ac.xul
+++ b/xpfe/components/prefwindow/resources/content/pref-smart_browsing-ac.xul
@@ -38,6 +38,7 @@
       setCheck("cbxAutoFill", window.arguments[0]);
       setCheck("cbxShowPopup", window.arguments[1]);
       setCheck("cbxShowSearch", window.arguments[2]);
+      setCheck("cbxMatchOnlyTyped", window.arguments[3]);
 
       updateImage("AutoFill");
       updateImage("ShowPopup");
@@ -50,7 +51,8 @@
     {
       window.opener.receiveACPrefs(getCheck("cbxAutoFill"), 
                                    getCheck("cbxShowPopup"),
-                                   getCheck("cbxShowSearch"));
+                                   getCheck("cbxShowSearch"),
+                                   getCheck("cbxMatchOnlyTyped"));
                                          
       return true;                                           
     }
@@ -101,6 +103,7 @@
                 oncommand="updateShowPopup(); updateImage('ShowPopup')"/>
       <checkbox id="cbxShowSearch" label="&autoCompleteShowSearch.label;"
                 oncommand="updateImage('ShowSearch')"/>
+      <checkbox id="cbxMatchOnlyTyped" label="&autoCompleteMatchOnlyTyped.label;"/>
     </vbox>
   </groupbox>
   
diff --git a/xpfe/components/prefwindow/resources/content/pref-smart_browsing.js b/xpfe/components/prefwindow/resources/content/pref-smart_browsing.js
index c072e0863ac2..813657977210 100644
--- a/xpfe/components/prefwindow/resources/content/pref-smart_browsing.js
+++ b/xpfe/components/prefwindow/resources/content/pref-smart_browsing.js
@@ -173,14 +173,16 @@ function showACAdvanced()
                     "modal=yes,chrome,resizable=no",
                     document.getElementById("browserUrlbarAutoFill").getAttribute("value"),
                     document.getElementById("browserUrlbarShowPopup").getAttribute("value"),
-                    document.getElementById("browserUrlbarShowSearch").getAttribute("value"));
+                    document.getElementById("browserUrlbarShowSearch").getAttribute("value"),
+                    document.getElementById("browserUrlbarMatchOnlyTyped").getAttribute("value"));
 }
 
-function receiveACPrefs(aAutoFill, aShowPopup, aShowSearch)
+function receiveACPrefs(aAutoFill, aShowPopup, aShowSearch, aAutoType)
 {
   document.getElementById("browserUrlbarAutoFill").setAttribute("value", aAutoFill);
   document.getElementById("browserUrlbarShowPopup").setAttribute("value", aShowPopup);
   document.getElementById("browserUrlbarShowSearch").setAttribute("value", aShowSearch);
+  document.getElementById("browserUrlbarMatchOnlyTyped").setAttribute("value", aAutoType);
 }
 
  
diff --git a/xpfe/components/prefwindow/resources/content/pref-smart_browsing.xul b/xpfe/components/prefwindow/resources/content/pref-smart_browsing.xul
index c0ca89d3bf4f..73e72f8b5062 100644
--- a/xpfe/components/prefwindow/resources/content/pref-smart_browsing.xul
+++ b/xpfe/components/prefwindow/resources/content/pref-smart_browsing.xul
@@ -47,7 +47,8 @@
   
   var _elementIDs = ["browserRelatedDisabledForDomains", "addDomain",
                      "browserGoBrowsingEnabled", "browserAutoCompleteEnabled",
-                     "browserUrlbarAutoFill", "browserUrlbarShowPopup", "browserUrlbarShowSearch"];
+                     "browserUrlbarAutoFill", "browserUrlbarShowPopup", "browserUrlbarShowSearch",
+                     "browserUrlbarMatchOnlyTyped"];
   
   ]]>
   </script>
@@ -121,11 +122,13 @@
                   oncommand="toggleAutoCompleteAdvancedButton()" flex="1"/>
       <button label="&autoCompleteAdvanced.label;" oncommand="showACAdvanced()" id="autoCompleteAdvancedButton"/>
       <data id="browserUrlbarAutoFill" preftype="bool" prefattribute="value"
-            prefstring="browser.urlbar.autoFill"/>"
+            prefstring="browser.urlbar.autoFill"/>
       <data id="browserUrlbarShowPopup" preftype="bool" prefattribute="value"
-            prefstring="browser.urlbar.showPopup"/>"
+            prefstring="browser.urlbar.showPopup"/>
       <data id="browserUrlbarShowSearch" preftype="bool" prefattribute="value"
-            prefstring="browser.urlbar.showSearch"/>"
+            prefstring="browser.urlbar.showSearch"/>
+      <data id="browserUrlbarMatchOnlyTyped" preftype="bool" prefattribute="value"
+            prefstring="browser.urlbar.matchOnlyTyped"/>
     </hbox>
   </groupbox>
 </page>
diff --git a/xpfe/components/prefwindow/resources/locale/en-US/pref-smart_browsing.dtd b/xpfe/components/prefwindow/resources/locale/en-US/pref-smart_browsing.dtd
index 6e7c22d5fd25..fea9fb135541 100644
--- a/xpfe/components/prefwindow/resources/locale/en-US/pref-smart_browsing.dtd
+++ b/xpfe/components/prefwindow/resources/locale/en-US/pref-smart_browsing.dtd
@@ -38,5 +38,6 @@
 <!ENTITY  autoCompleteAutoFill.label             "Autocomplete best match as you type">
 <!ENTITY  autoCompleteShowPopup.label            "Show list of matching results">
 <!ENTITY  autoCompleteShowSearch.label           "Show internet search engine">
+<!ENTITY  autoCompleteMatchOnlyTyped.label       "Match only websites you've typed previously">
 <!ENTITY  autocompletePreview.label              "Preview">