Index: /src/org/openstreetmap/josm/gui/preferences/PluginPreference.java
===================================================================
--- /src/org/openstreetmap/josm/gui/preferences/PluginPreference.java	(revision 286)
+++ /src/org/openstreetmap/josm/gui/preferences/PluginPreference.java	(revision 287)
@@ -91,5 +91,5 @@
             }
 		});
-		plugin.add(update, GBC.std().insets(0,0,10,0));
+		//TODO: plugin.add(update, GBC.std().insets(0,0,10,0));
 
 		JButton configureSites = new JButton(tr("Configure Plugin Sites"));
@@ -99,5 +99,5 @@
             }
 		});
-		plugin.add(configureSites, GBC.std());
+		//TODO: plugin.add(configureSites, GBC.std());
 
 		refreshPluginPanel(gui);
@@ -140,4 +140,5 @@
 			File[] pluginFiles = new File(location).listFiles();
 			if (pluginFiles != null) {
+				Arrays.sort(pluginFiles);
 				for (File f : pluginFiles) {
 					if (!f.isFile())
@@ -149,9 +150,10 @@
 	                    } catch (PluginException x) {
 	                    }
-					} else if (f.getName().endsWith(".xml")) {
+					} else if (f.getName().matches("^[0-9]+-site.*\\.xml$")) {
 						try {
 	                        Uniform<PluginDescription> parser = new Uniform<PluginDescription>(new FileReader(f), "plugin", PluginDescription.class);
 	                        for (PluginDescription pd : parser)
-	                        	availablePlugins.put(pd.name, pd);
+	                        	if (!availablePlugins.containsKey(pd.name))
+	                        		availablePlugins.put(pd.name, pd);
                         } catch (Exception e) {
 	                        e.printStackTrace();
Index: /src/org/openstreetmap/josm/plugins/PluginDownloader.java
===================================================================
--- /src/org/openstreetmap/josm/plugins/PluginDownloader.java	(revision 286)
+++ /src/org/openstreetmap/josm/plugins/PluginDownloader.java	(revision 287)
@@ -28,5 +28,5 @@
 	public static int downloadDescription() {
 		int count = 0;
-		for (String site : Main.pref.get("pluginmanager.sites", "http://josm.openstreetmap.de/wiki/Plugins").split(" ")) {
+		for (String site : Main.pref.get("pluginmanager.sites", "http://josm.openstreetmap.de/wiki/Plugins/LatestRelease http://josm.openstreetmap.de/wiki/Plugins").split(" ")) {
 			try {
 				BufferedReader r = new BufferedReader(new InputStreamReader(new URL(site).openStream()));
@@ -38,5 +38,5 @@
 				r.close();
 				new File(Main.pref.getPreferencesDir()+"plugins").mkdir();
-				FileWriter out = new FileWriter(Main.pref.getPreferencesDir()+"plugins/site-"+site.replaceAll("[/:\\\\ <>|]", "_")+".xml");
+				FileWriter out = new FileWriter(Main.pref.getPreferencesDir()+"plugins/"+count+"-site-"+site.replaceAll("[/:\\\\ <>|]", "_")+".xml");
 				out.append(txt);
 				out.close();