diff --git a/mozilla/modules/libpref/src/init/all.js b/mozilla/modules/libpref/src/init/all.js
index 65593f227ad..83016612b3c 100644
--- a/mozilla/modules/libpref/src/init/all.js
+++ b/mozilla/modules/libpref/src/init/all.js
@@ -201,6 +201,9 @@ pref("nglayout.debug.enable_xbl_forms", false);
 // size of scrollbar snapping region
 pref("slider.snapMultiplier", 6);
 
+// option to choose plug-in finder
+pref("application.use_ns_plugin_finder", false);
+
 // Smart Browsing prefs
 pref("browser.related.enabled", true);
 pref("browser.related.autoload", 1);  // 0 = Always, 1 = After first use, 2 = Never
diff --git a/mozilla/xpfe/components/prefwindow/resources/content/pref-applications.xul b/mozilla/xpfe/components/prefwindow/resources/content/pref-applications.xul
index 4b97d949456..ecd8d4f70a2 100644
--- a/mozilla/xpfe/components/prefwindow/resources/content/pref-applications.xul
+++ b/mozilla/xpfe/components/prefwindow/resources/content/pref-applications.xul
@@ -35,6 +35,12 @@
                 src="chrome://communicator/locale/pref/pref-applications.properties"/>
   <script type="application/x-javascript" src="chrome://communicator/content/pref/pref-applications.js"/>
   <script type="application/x-javascript" src="chrome://communicator/content/pref/overrideHandler.js"/>
+
+    <script type="application/x-javascript">
+    <![CDATA[  
+    var _elementIDs = ["useNSPluginFinder"];
+    ]]>
+    </script>
         
   <groupbox flex="1">
     <caption label="&descript;"/>
@@ -106,6 +112,16 @@
       </vbox>
     </hbox>
   </groupbox>
+  <groupbox id="pluginFinderBox">
+    <caption label="&plugins.label;"/>
+    <vbox>
+      <hbox pack="start" align="center">
+        <checkbox id="useNSPluginFinder" label="&pluginFinder.label;"
+                  prefstring="application.use_ns_plugin_finder"/>
+      </hbox>
+      <description>&pluginFinderDesc.label;</description>
+    </vbox>
+  </groupbox>
   <groupbox>
     <caption label="&fileOpening.label;"/>
     <hbox pack="start" align="center">