diff --git a/mozilla/webtools/addons/public/htdocs/pfs.php b/mozilla/webtools/addons/public/htdocs/pfs.php
index d1a898bbfc9..f1936025c0d 100644
--- a/mozilla/webtools/addons/public/htdocs/pfs.php
+++ b/mozilla/webtools/addons/public/htdocs/pfs.php
@@ -194,11 +194,18 @@ if (!empty($mimetype) &&
 
         $name = 'Java Runtime Environment';
         $version = '';
-        $manualInstallationURL = 'http://java.com/en/download/manual.jsp';
+        $manualInstallationURL = 'http://java.com/download/manual.jsp';
         $installerShowsUI = 'true';
         $needsRestart = 'true';
 
-        if (preg_match('/^Win/', $clientOS)) {
+        // For now, send Vista users to a manual download page.
+        //
+        // This is a temp fix for bug 366129 until vista has a non-manual
+        // solution.
+        if (preg_match('/^Windows NT 6\.0/', $clientOS)) {
+            $guid = '{fbe640ef-4375-4f45-8d79-767d60bf75b8}';
+            $XPILocation = getUriForNoXPI();
+        } elseif (preg_match('/^Win/', $clientOS)) {
             $guid = '{92a550f2-dfd2-4d2f-a35d-a98cfda73595}';
             $XPILocation = 'http://java.com/jre-install.xpi';
         } else {
diff --git a/mozilla/webtools/addons/public/tpl/plugins.tpl b/mozilla/webtools/addons/public/tpl/plugins.tpl
index 7cd428bee64..5dbc3ed101c 100644
--- a/mozilla/webtools/addons/public/tpl/plugins.tpl
+++ b/mozilla/webtools/addons/public/tpl/plugins.tpl
@@ -39,9 +39,9 @@
     <p><img src="{$config.webpath}/images/faq_small.png" style="float: left;" height="16" width="16" alt=""/>&nbsp;Visit the <a href="http://www.java.com/en/download/index.jsp">Java download page</a> to select the latest version for your operating system.</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.java.com/en/download/index.jsp">Version 5.0 Update 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;<a href="http://www.java.com/en/download/index.jsp">Version 5.0 Update 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://plugindoc.mozdev.org/OSX.html#Java">Details</a></div>
+        <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.java.com/en/download/">Latest Version</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.java.com/en/download/">Latest Version</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.java.com/en/download/">Latest Version</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>