diff --git a/mozilla/modules/plugin/samples/default/os2/plugin.h b/mozilla/modules/plugin/samples/default/os2/plugin.h
index a15f28eff8b..1a3fb061a55 100644
--- a/mozilla/modules/plugin/samples/default/os2/plugin.h
+++ b/mozilla/modules/plugin/samples/default/os2/plugin.h
@@ -110,7 +110,7 @@ public:
 };
 
 
-#define PAGE_URL_FOR_JAVASCRIPT "http://plugins.netscape.com/plug-in_finder.adp"
+#define PAGE_URL_FOR_JAVASCRIPT "http://plugindoc.mozdev.org/winmime.html"
 
 #define PLUGINFINDER_COMMAND_BEGINNING "javascript:window.open(\""
 #define PLUGINFINDER_COMMAND_END "\",\"plugin\",\"toolbar=no,status=no,resizable=no,scrollbars=no,height=252,width=626\");"
diff --git a/mozilla/modules/plugin/samples/default/unix/nullplugin.h b/mozilla/modules/plugin/samples/default/unix/nullplugin.h
index 56dc8a05e35..43cb705869f 100644
--- a/mozilla/modules/plugin/samples/default/unix/nullplugin.h
+++ b/mozilla/modules/plugin/samples/default/unix/nullplugin.h
@@ -56,7 +56,7 @@
 #define CLICK_WHEN_DONE     "Click here after installing the plugin"
 
 #define REFRESH_PLUGIN_LIST "javascript:navigator.plugins.refresh(true)"
-#define PLUGINSPAGE_URL     "http://plugins.netscape.com/plug-in_finder.adp" /* XXX Branding: make configurable via .properties or prefs */
+#define PLUGINSPAGE_URL     "http://plugindoc.mozdev.org/winmime.html" /* XXX Branding: make configurable via .properties or prefs */
 #define OK_BUTTON           "OK"
 #define CANCEL_BUTTON       "CANCEL"
 #if defined(HPUX)
@@ -64,7 +64,7 @@
 #elif defined(VMS)
 #define JVM_SMARTUPDATE_URL "http://www.openvms.compaq.com/openvms/products/ips/mozilla_relnotes.html#java"
 #else 
-#define JVM_SMARTUPDATE_URL "http://home.netscape.com/plugins/jvm.html" /* XXX Branding: see above */
+#define JVM_SMARTUPDATE_URL "http://java.com/download" /* XXX Branding: see above */
 #endif /* HPUX */
 #define JVM_MINETYPE        "application/x-java-vm"
 #define MESSAGE "\
diff --git a/mozilla/modules/plugin/samples/default/windows/plugin.h b/mozilla/modules/plugin/samples/default/windows/plugin.h
index 91687d97aa7..34961aa4369 100644
--- a/mozilla/modules/plugin/samples/default/windows/plugin.h
+++ b/mozilla/modules/plugin/samples/default/windows/plugin.h
@@ -110,12 +110,12 @@ public:
 };
 
 
-#define PAGE_URL_FOR_JAVASCRIPT "http://plugins.netscape.com/plug-in_finder.adp"
+#define PAGE_URL_FOR_JAVASCRIPT "http://plugindoc.mozdev.org/winmime.html"
 
 #define PLUGINFINDER_COMMAND_BEGINNING ""
 #define PLUGINFINDER_COMMAND_END ""
-#define DEFAULT_PLUGINFINDER_URL "http://plugins.netscape.com/plug-in_finder.adp"
-#define JVM_SMARTUPDATE_URL "http://plugins.netscape.com/plug-in_finder.adp"
+#define DEFAULT_PLUGINFINDER_URL "http://plugindoc.mozdev.org/winmime.html"
+#define JVM_SMARTUPDATE_URL "http://java.com/download"
 
 #ifdef WIN32
 #define REGISTRY_PLACE "Software\\Netscape\\Netscape Navigator\\Default Plugin"