diff --git a/mozilla/webtools/addons/public/htdocs/search.php b/mozilla/webtools/addons/public/htdocs/search.php
index 9c4eecfd94a..866202945ed 100644
--- a/mozilla/webtools/addons/public/htdocs/search.php
+++ b/mozilla/webtools/addons/public/htdocs/search.php
@@ -48,10 +48,8 @@ if (isset($_GET['date'])&&$_GET['date']!='null'&&ctype_alpha($_GET['date'])) {
 }
 
 // Application.
-if (isset($_GET['app'])&&$_GET['app']!='null'&&ctype_alpha($_GET['app'])) {
-    $clean['app'] = $_GET['app'];
-} elseif ($_GET['app']=='null') {
-    unset($clean['app']);
+if (isset($_GET['appfilter'])&&$_GET['appfilter']!='null'&&is_numeric($_GET['appfilter'])) {
+    $clean['appfilter'] = $_GET['appfilter'];
 }
 
 // Query.
@@ -108,12 +106,6 @@ $sort = array(
     'downloads' => 'Popularity'
 );
 
-$apps = array(
-    'firefox'     => 'Firefox',
-    'thunderbird' => 'Thunderbird',
-    'mozilla'     => 'Mozilla'
-);
-
 $perpage = array(
     10 => '10',
     25 => '25',
@@ -155,7 +147,7 @@ if (!empty($sql['platform'])) {
 
 if (!empty($sql['app'])) {
     $select .= " INNER JOIN applications ON version.AppID = applications.AppID ";
-    $where .= " applications.AppName = '{$sql['app']}' AND ";
+    $where .= " applications.AppID = '{$sql['appfilter']}' AND ";
 }
 
 if (!empty($sql['q'])) {
@@ -270,7 +262,7 @@ $tpl->assign(
         'clean'         => $clean,
         'cats'          => $amo->getCats(),
         'platforms'     => $amo->getPlatforms(),
-        'apps'          => $apps,
+        'apps'          => $amo->getApps(),
         'dates'         => $dates,
         'sort'          => $sort,
         'perpage'       => $perpage,
diff --git a/mozilla/webtools/addons/public/inc/config-dist.php b/mozilla/webtools/addons/public/inc/config-dist.php
index 32fed82aea3..2d8a76fb665 100644
--- a/mozilla/webtools/addons/public/inc/config-dist.php
+++ b/mozilla/webtools/addons/public/inc/config-dist.php
@@ -178,6 +178,7 @@ $memcache_config = array(
  */
 $contentType_config = array(
     'update.php' => 'text/xml; charset=utf-8',
-    'rss.php'    => 'text/xml; charset=utf-8'
+    'rss.php'    => 'text/xml; charset=utf-8',
+    'pfs.php'    => 'text/xml; charset=utf-8'
 );
 ?>
diff --git a/mozilla/webtools/addons/public/tpl/inc/wrappers/default-header.tpl b/mozilla/webtools/addons/public/tpl/inc/wrappers/default-header.tpl
index 7558df64d64..e722c6d9a2f 100644
--- a/mozilla/webtools/addons/public/tpl/inc/wrappers/default-header.tpl
+++ b/mozilla/webtools/addons/public/tpl/inc/wrappers/default-header.tpl
@@ -63,7 +63,7 @@
         <ul id="menu-firefox">
             <li{if $currentTab eq "home"} class="current"{/if}><a href="{$config.webpath}/{$app}/">Home</a></li>
             <li{if $currentTab eq "extensions"} class="current"{/if}><a href="{$config.webpath}/{$app}/extensions/">Extensions</a></li>
-            <li{if $currentTab eq "pfs"} class="current"{/if}><a href="https://pfs.mozilla.org/plugins/?app={$app}">Plugins</a></li>
+            <li{if $currentTab eq "pfs"} class="current"{/if}><a href="{$config.webpath}/{$app}/plugins/">Plugins</a></li>
             <li{if $currentTab eq "search-engines"} class="current"{/if}><a href="{$config.webpath}/{$app}/search-engines/">Search Engines</a></li>
             <li{if $currentTab eq "themes"} class="current"{/if}><a href="{$config.webpath}/{$app}/themes/">Themes</a></li>
         </ul>
diff --git a/mozilla/webtools/addons/public/tpl/inc/wrappers/nonav-header.tpl b/mozilla/webtools/addons/public/tpl/inc/wrappers/nonav-header.tpl
index ce1c4af3ffb..3a2d45c4334 100644
--- a/mozilla/webtools/addons/public/tpl/inc/wrappers/nonav-header.tpl
+++ b/mozilla/webtools/addons/public/tpl/inc/wrappers/nonav-header.tpl
@@ -62,7 +62,7 @@
         <ul id="menu-firefox">
             <li{if $currentTab eq "home"} class="current"{/if}><a href="{$config.webpath}/{$app}/">Home</a></li>
             <li{if $currentTab eq "extensions"} class="current"{/if}><a href="{$config.webpath}/{$app}/extensions/">Extensions</a></li>
-            <li{if $currentTab eq "pfs"} class="current"{/if}><a href="https://pfs.mozilla.org/plugins/?app={$app}">Plugins</a></li>
+            <li{if $currentTab eq "pfs"} class="current"{/if}><a href="{$config.webpath}/{$app}/plugins/">Plugins</a></li>
             <li{if $currentTab eq "search-engines"} class="current"{/if}><a href="{$config.webpath}/{$app}/search-engines/">Search Engines</a></li>
             <li{if $currentTab eq "themes"} class="current"{/if}><a href="{$config.webpath}/{$app}/themes/">Themes</a></li>
         </ul>
diff --git a/mozilla/webtools/addons/public/tpl/pfs.tpl b/mozilla/webtools/addons/public/tpl/pfs.tpl
new file mode 100644
index 00000000000..5ef929e6282
--- /dev/null
+++ b/mozilla/webtools/addons/public/tpl/pfs.tpl
@@ -0,0 +1,31 @@
+<?xml version="1.0"?>
+<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:pfs="http://www.mozilla.org/2004/pfs-rdf#">
+
+{if $plugin.name}
+<RDF:Description about="urn:mozilla:plugin-results:{$plugin.mimetype|escape:html:"UTF-8"}">
+ <pfs:plugins><RDF:Seq>
+  <RDF:li resource="urn:mozilla:plugin:{$plugin.guid|escape:html:"UTF-8"}"/>
+ </RDF:Seq></pfs:plugins>
+</RDF:Description>
+
+<RDF:Description about="urn:mozilla:plugin:{$plugin.guid|escape:html:"UTF-8"}">
+ <pfs:updates><RDF:Seq>
+  <RDF:li resource="urn:mozilla:plugin:{$plugin.guid|escape:html:"UTF-8"}:{$plugin.version|escape:html:"UTF-8"}"/>
+ </RDF:Seq></pfs:updates>
+</RDF:Description>
+
+<RDF:Description about="urn:mozilla:plugin:{$plugin.guid|escape:html:"UTF-8"}:{$plugin.version|escape:html:"UTF-8"}">
+ <pfs:name>{$plugin.name|escape:html:"UTF-8"}</pfs:name>
+ <pfs:requestedMimetype>{$plugin.mimetype|escape:html:"UTF-8"}</pfs:requestedMimetype>
+ <pfs:guid>{$plugin.guid|escape:html:"UTF-8"}</pfs:guid>
+ <pfs:version>{$plugin.version|escape:html:"UTF-8"}</pfs:version>
+ <pfs:IconUrl>{$plugin.iconUrl|escape:html:"UTF-8"}</pfs:IconUrl>
+ <pfs:XPILocation>{$plugin.XPILocation|escape:html:"UTF-8"}</pfs:XPILocation>
+ <pfs:InstallerShowsUI>{$plugin.installerShowsUI|escape:html:"UTF-8"}</pfs:InstallerShowsUI>
+ <pfs:manualInstallationURL>{$plugin.manualInstallationURL|escape:html:"UTF-8"}</pfs:manualInstallationURL>
+ <pfs:licenseURL>{$plugin.licenseURL|escape:html:"UTF-8"}</pfs:licenseURL>
+ <pfs:needsRestart>{$plugin.needsRestart|escape:html:"UTF-8"}</pfs:needsRestart>
+</RDF:Description>
+{/if}
+
+</RDF:RDF>
diff --git a/mozilla/webtools/addons/public/tpl/plugins.tpl b/mozilla/webtools/addons/public/tpl/plugins.tpl
new file mode 100644
index 00000000000..084ec4c9ce6
--- /dev/null
+++ b/mozilla/webtools/addons/public/tpl/plugins.tpl
@@ -0,0 +1,113 @@
+<div id="mBody">
+    
+<div id="side">
+    <ul id="nav">
+        <li><a href="http://plugindoc.mozdev.org" title="Plugin Support for Mozilla-based Browsers">Plugin Documentation</a></li>
+        <li><a href="../">Mozilla Update Home</a></li>
+    </ul>
+</div>
+
+<div id="mainContent">
+
+<h2 class="first">Common Plugins for Mozilla Firefox and Mozilla Suite</h2>
+<p class="first">Plugins are programs that allow websites to provide content to you and have it appear in your browser.</p>
+
+<div class="item">
+    <h2 class="first"><a href="http://www.adobe.com/products/acrobat/readermain.html">Acrobat Reader</a></h2>
+    <p class="first">By <a href="http://www.adobe.com">Adobe Systems</a></p>
+    <p class="first">For viewing and printing Adobe Portable Document Format (PDF) files</p>
+    <p><img src="{$config.webpath}/images/faq_small.png" style="float: left;" height=16 width=16 alt="">&nbsp;Adobe Reader 7.0 requires Windows 2000 or later. If you are using Windows 98 SE, Windows Me, or Windows NT 4.0, you will need to use Adobe Reader 6.0.3</p>
+    <h3><img src="{$config.webpath}/images/install.png" height="24" width="24" alt="">&nbsp;Download</h3>
+    <div style="margin-top: 5px; height: 50px">
+        <div class="iconbar"><img src="{$config.webpath}/images/windows_icon.png" height="34" width="34" alt="">&nbsp;For Windows:<br>&nbsp;&nbsp;<a href="http://ardownload.adobe.com/pub/adobe/reader/win/7x/7.0/enu/AdbeRdr70_enu_full.exe">Version 7.0</a><br><a href="http://ardownload.adobe.com/pub/adobe/reader/win/6.x/6.0/enu/AdbeRdr602_distrib_enu.exe">6.02 Full</a> / <a href="http://ardownload.adobe.com/pub/adobe/acrobat/win/6.x/6.0.3/misc/Acro-Reader_603_Update.exe">6.03 Update</a></div>
+        <div class="iconbar"><img src="{$config.webpath}/images/linux_icon.png" height="34" width="34" alt="">&nbsp;For Linux:<br>&nbsp;&nbsp;<a href="http://ardownload.adobe.com/pub/adobe/acrobatreader/unix/5.x/linux-5010.tar.gz">Version 5.10</a></div>
+        <div class="iconbar"><img src="{$config.webpath}/images/macosx_icon.png" height="34" width="34" alt="">&nbsp;For MacOSX:<br>&nbsp;&nbsp;Unsupported <a href="http://plugindoc.mozdev.org/OSX.html#Acrobat">(Details)</a></div>
+    </div>
+    <div class="baseline"><img src="{$config.webpath}/images/faq_small.png" style="float: left;" height=16 width=16 alt="">&nbsp;Support Documentation: <a href="http://plugindoc.mozdev.org/windows.html#Acrobat">Windows</a>, <a href="http://plugindoc.mozdev.org/linux.html#Acrobat">Linux</a>, <a href="http://plugindoc.mozdev.org/OSX.html#Acrobat">MacOSX</a> | <a href="http://plugindoc.mozdev.org/faqs/acroread.html">Acrobat Reader FAQ</a></div>
+</div>
+
+<div class="item">
+    <h2 class="first"><a href="http://www.macromedia.com/software/flashplayer/">Flash Player</a></h2>
+    <p class="first">By <a href="http://www.macromedia.com">Macromedia</a></p>
+    <p class="first">Macromedia Flash Player is the universal rich client for delivering effective Macromedia Flash experiences across desktops and devices.</p>
+    <h3><img src="{$config.webpath}/images/install.png" height="24" width="24" alt="">&nbsp;Download</h3>
+    <div style="margin-top: 5px; height: 38px">
+        <div class="iconbar"><img src="{$config.webpath}/images/windows_icon.png" height="34" width="34" alt="">&nbsp;For Windows:<br>&nbsp;&nbsp;<a href="http://www.macromedia.com/go/getflashplayer">Version 8</a></div>
+        <div class="iconbar"><img src="{$config.webpath}/images/linux_icon.png" height="34" width="34" alt="">&nbsp;For Linux:<br>&nbsp;&nbsp;<a href="http://www.macromedia.com/go/getflashplayer">Version 7</a></div>
+        <div class="iconbar"><img src="{$config.webpath}/images/macosx_icon.png" height="34" width="34" alt="">&nbsp;For MacOSX:<br>&nbsp;&nbsp;<a href="http://www.macromedia.com/go/getflashplayer">Version 8</a></div>
+    </div>
+    <div class="baseline"><img src="{$config.webpath}/images/faq_small.png" style="float: left;" height=16 width=16 alt="">&nbsp;Support Documentation: <a href="http://plugindoc.mozdev.org/windows.html#Flash">Windows</a>, <a href="http://plugindoc.mozdev.org/linux.html#Flash">Linux</a>, <a href="http://plugindoc.mozdev.org/OSX.html#Flash">MacOSX</a> | <a href="http://plugindoc.mozdev.org/faqs/flash.html">Flash Player FAQ</a></div>
+</div>
+
+<div class="item">
+    <h2 class="first"><a href="http://www.java.com/en/about/">Java</a></h2>
+    <p class="first">By <a href="http://www.sun.com">Sun Microsystems</a></p>
+    <p class="first">The Java Runtime Enviroment enables your computer to run applications and applets that use Java technology.</p>
+    <h3><img src="{$config.webpath}/images/install.png" height="24" width="24" alt="">&nbsp;Download</h3>
+    <div style="margin-top: 5px; height: 38px">
+        <div class="iconbar"><img src="{$config.webpath}/images/windows_icon.png" height="34" width="34" alt="">&nbsp;For Windows:<br>&nbsp;&nbsp;<a href="http://javashoplm.sun.com/ECom/docs/Welcome.jsp?StoreId=22&amp;PartDetailId=jre-1.5.0_01-oth-JPR&amp;SiteId=JSC&amp;TransactionId=noreg">Version 5.0 Update 1</a></div>
+        <div class="iconbar"><img src="{$config.webpath}/images/linux_icon.png" height="34" width="34" alt="">&nbsp;For Linux:<br>&nbsp;&nbsp;<a href="http://javashoplm.sun.com/ECom/docs/Welcome.jsp?StoreId=22&amp;PartDetailId=jre-1.5.0_01-oth-JPR&amp;SiteId=JSC&amp;TransactionId=noreg">Version 5.0 Update 1</a></div>
+        <div class="iconbar"><img src="{$config.webpath}/images/macosx_icon.png" height="34" width="34" alt="">&nbsp;For MacOSX:<br>&nbsp;&nbsp;<a href="http://plugindoc.mozdev.org/OSX.html#Java">Details</a></div>
+    </div>
+    <div class="baseline"><img src="{$config.webpath}/images/faq_small.png" style="float: left;" height=16 width=16 alt="">&nbsp;Support Documentation: <a href="http://plugindoc.mozdev.org/windows.html#Java">Windows</a>, <a href="http://plugindoc.mozdev.org/linux.html#Java">Linux</a>, <a href="http://plugindoc.mozdev.org/OSX.html#Java">MacOSX</a> | <a href="http://plugindoc.mozdev.org/faqs/java.html">Java Plugin FAQ</a></div>
+</div>
+
+
+<div class="item">
+    <h2 class="first"><a href="http://www.apple.com/quicktime/">Quicktime</a></h2>
+    <p class="first">By <a href="http://www.apple.com">Apple Computer</a></p>
+    <p class="first">QuickTime Player is an easy-to-use application for playing, interacting with or viewing video, audio, VR or graphics files.</p>
+    <h3><img src="/images/install.png" height="24" width="24" alt="">&nbsp;Download</h3>
+    <div style="margin-top: 5px; height: 38px">
+        <div class="iconbar"><img src="{$config.webpath}/images/windows_icon.png" height="34" width="34" alt="">&nbsp;For Windows:<br>&nbsp;&nbsp;<a href="http://www.apple.com/quicktime/download/">Version 7</a></div>
+        <div class="iconbar"><img src="{$config.webpath}/images/linux_icon.png" height="34" width="34" alt="">&nbsp;For Linux:<br>&nbsp;&nbsp;Unavailable</div>
+        <div class="iconbar"><img src="{$config.webpath}/images/macosx_icon.png" height="34" width="34" alt="">&nbsp;For MacOSX:<br>&nbsp;&nbsp;<a href="http://www.apple.com/quicktime/download/">Version 7</a></div>
+    </div>
+    <div class="baseline"><img src="{$config.webpath}/images/faq_small.png" style="float: left;" height=16 width=16 alt="">&nbsp;Support Documentation: <a href="http://plugindoc.mozdev.org/windows.html#Quicktime">Windows</a>, <a href="http://plugindoc.mozdev.org/OSX.html#Quicktime">MacOSX</a></div>
+</div>
+
+<div class="item">
+    <h2 class="first"><a href="http://www.real.com/player/">RealPlayer</a></h2>
+    <p class="first">By <a href="http://www.real.com">Real Networks</a></p>
+    <p class="first">RealPlayer enables your computer to play streaming RealVideo and RealAudio.</p>
+    <h3><img src="{$config.webpath}/images/install.png" height="24" width="24" alt="">&nbsp;Download</h3>
+    <div style="margin-top: 5px; height: 38px">
+        <div class="iconbar"><img src="{$config.webpath}/images/windows_icon.png" height="34" width="34" alt="">&nbsp;For Windows:<br>&nbsp;&nbsp;<a href="http://www.real.com/R/RC.040104freeplayer.def...R/forms.real.com/real/realone/realone.html?type=eva1&amp;rppr=rnwk&amp;src=040104freeplayer">Version 10</a></div>
+        <div class="iconbar"><img src="{$config.webpath}/images/linux_icon.png" height="34" width="34" alt="">&nbsp;For Linux:<br>&nbsp;&nbsp;<a href="http://www.real.com/R/RC.040104freeplayer.def...R/forms.real.com/real/player/unix/unix.html?rppr=rnwk&amp;src=040104freeplayer">Version 10</a></div>
+        <div class="iconbar"><img src="{$config.webpath}/images/macosx_icon.png" height="34" width="34" alt="">&nbsp;For MacOSX:<br>&nbsp;&nbsp;<a href="http://www.real.com/R/RC.040104freeplayer.def...R/forms.real.com/real/realone/mac.html?rppr=rnwk&amp;src=040104freeplayer">Version 10</a></div>
+    </div>
+    <div class="baseline"><img src="{$config.webpath}/images/faq_small.png" style="float: left;" height=16 width=16 alt="">&nbsp;Support Documentation: <a href="http://plugindoc.mozdev.org/windows.html#RealOne">Windows</a>, <a href="http://plugindoc.mozdev.org/linux.html#RealPlayer">Linux</a>, <a href="http://plugindoc.mozdev.org/OSX.html#RealOne">MacOSX</a></div>
+</div>
+
+<div class="item">
+    <h2 class="first"><a href="http://www.macromedia.com/software/shockwaveplayer/">Shockwave</a></h2>
+    <p class="first">By <a href="http://www.macromedia.com">Macromedia</a></p>
+    <p class="first">Shockwave Player displays Web content that has been created by Macromedia Director.</p>
+    <h3><img src="{$config.webpath}/images/install.png" height="24" width="24" alt="">&nbsp;Download</h3>
+    <div style="margin-top: 5px; height: 38px">
+        <div class="iconbar"><img src="{$config.webpath}/images/windows_icon.png" height="34" width="34" alt="">&nbsp;For Windows:<br>&nbsp;&nbsp;<a href="http://www.macromedia.com/shockwave/download/index.cgi?P1_Prod_Version=Shockwave&amp;P2_Platform=Win32&amp;P3_Browser_Version=NetscapePre4">Version 10</a></div>
+        <div class="iconbar"><img src="{$config.webpath}/images/linux_icon.png" height="34" width="34" alt="">&nbsp;For Linux:<br>&nbsp;&nbsp;Unavailable</div>
+        <div class="iconbar"><img src="{$config.webpath}/images/macosx_icon.png" height="34" width="34" alt="">&nbsp;For MacOSX:<br>&nbsp;&nbsp;<a href="http://www.macromedia.com/shockwave/download/index.cgi?P1_Prod_Version=Shockwave&amp;P2_Platform=MacOSX">Version 10</a></div>
+    </div>
+    <div class="baseline"><img src="{$config.webpath}/images/faq_small.png" style="float: left;" height=16 width=16 alt="">&nbsp;Support Documentation: <a href="http://plugindoc.mozdev.org/windows.html#Shockwave">Windows</a>, <a href="http://plugindoc.mozdev.org/OSX.html#Shockwave">MacOSX</a></div>
+</div>
+
+<div class="item">
+    <h2 class="first"><a href="http://www.microsoft.com/windows/windowsmedia/default.aspx">Windows Media Player</a></h2>
+    <p class="first">By <a href="http://www.microsoft.com">Microsoft</a></p>
+    <p class="first">Windows Media Player lets you play streaming audio, video, animations, and multimedia presentations on the web.</p>
+    <h3><img src="{$config.webpath}/images/install.png" height="24" width="24" alt="">&nbsp;Download</h3>
+    <div style="margin-top: 5px; height: 38px">
+        <div class="iconbar"><img src="{$config.webpath}/images/windows_icon.png" height="34" width="34" alt="">&nbsp;For Windows:<br>&nbsp;&nbsp;<a href="http://www.microsoft.com/windows/windowsmedia/mp10/default.aspx">Vers. 10 for WinXP</a>, <a href="http://www.microsoft.com/windows/windowsmedia/9series/player.aspx">Vers. 9</a></div>
+        <div class="iconbar"><img src="{$config.webpath}/images/linux_icon.png" height="34" width="34" alt="">&nbsp;For Linux:<br>&nbsp;&nbsp;Unavailable</div>
+        <div class="iconbar"><img src="{$config.webpath}/images/macosx_icon.png" height="34" width="34" alt="">&nbsp;For MacOSX:<br>&nbsp;&nbsp;<a href="http://www.microsoft.com/mac/otherproducts/otherproducts.aspx?pid=windowsmedia">Version 9</a></div>
+    </div>
+    <div class="baseline"><img src="{$config.webpath}/images/faq_small.png" style="float: left;" height=16 width=16 alt="">&nbsp;Support Documentation: <a href="http://plugindoc.mozdev.org/windows.html#WMP">Windows</a>, <a href="http://plugindoc.mozdev.org/OSX.html#WMP">MacOSX</a></div>
+</div>
+
+<h2>Looking for a plugin not listed here?</h2>
+<p class="first">This page only lists the most common and most popular plugins. For more information about other plugins available for Mozilla-based Browsers, visit <a href="http://plugindoc.mozdev.org">PluginDoc</a>.</p>
+
+</div>
+
+</div>
diff --git a/mozilla/webtools/addons/public/tpl/search.tpl b/mozilla/webtools/addons/public/tpl/search.tpl
index 09135b4d180..5a2e2e4e9a2 100644
--- a/mozilla/webtools/addons/public/tpl/search.tpl
+++ b/mozilla/webtools/addons/public/tpl/search.tpl
@@ -33,10 +33,10 @@
     </div>
 
     <div>
-    <label class="amo-label-small" for="app">App:</label>
-    <select id="app" name="app">
+    <label class="amo-label-small" for="appfilter">App:</label>
+    <select id="appfilter" name="appfilter">
     <option value="null">Any</option>
-    {html_options options=$apps selected=$app}
+    {html_options options=$apps selected=$clean.appfilter}
     </select>
     </div>
 
diff --git a/mozilla/webtools/addons/shared/lib/amo.class.php b/mozilla/webtools/addons/shared/lib/amo.class.php
index 83c04fcc7ee..7fd0039d0a2 100644
--- a/mozilla/webtools/addons/shared/lib/amo.class.php
+++ b/mozilla/webtools/addons/shared/lib/amo.class.php
@@ -126,7 +126,8 @@ class AMO_Object
             FROM
                 applications
             WHERE
-                public_ver = 'YES'
+                public_ver = 'YES' AND
+                supported = 1
             GROUP BY
                 AppName
         ", SQL_INIT, SQL_ASSOC);