Index: /applications/editors/josm/plugins/wikipedia/src/org/wikipedia/WikipediaApp.java
===================================================================
--- /applications/editors/josm/plugins/wikipedia/src/org/wikipedia/WikipediaApp.java	(revision 30447)
+++ /applications/editors/josm/plugins/wikipedia/src/org/wikipedia/WikipediaApp.java	(revision 30448)
@@ -43,5 +43,5 @@
             final String bbox = min.lon() + "," + min.lat() + "," + max.lon() + "," + max.lat();
             // construct url
-            final String url = "http://toolserver.org/~kolossos/geoworld/marks.php?"
+            final String url = "https://tools.wmflabs.org/wp-world/marks.php?"
                     + "bbox=" + bbox + "&LANG=" + wikipediaLang;
             System.out.println("Wikipedia: GET " + url);
@@ -73,5 +73,5 @@
     static List<WikipediaEntry> getEntriesFromCategory(String wikipediaLang, String category, int depth) {
         try {
-            final String url = "http://tools.wmflabs.org/cats-php/"
+            final String url = "https://tools.wmflabs.org/cats-php/"
                     + "?lang=" + wikipediaLang
                     + "&depth=" + depth
@@ -108,5 +108,5 @@
         Map<String, Boolean> status = new HashMap<String, Boolean>();
         if (!articleNames.isEmpty()) {
-            final String url = "http://toolserver.org/~master/osmjson/getGeoJSON.php?action=check"
+            final String url = "https://tools.wmflabs.org/wiwosm/osmjson/getGeoJSON.php?action=check"
                     + "&lang=" + wikipediaLang;
             System.out.println("Wikipedia: POST " + url + " " + articleNames);
@@ -163,5 +163,5 @@
         try {
             Collection<WikipediaLangArticle> r = new ArrayList<WikipediaLangArticle>();
-            final String url = "http://" + wikipediaLang + ".wikipedia.org/w/api.php" +
+            final String url = "https://" + wikipediaLang + ".wikipedia.org/w/api.php" +
                     "?action=query" +
                     "&prop=langlinks" +
@@ -294,5 +294,5 @@
         private void updateWiwosmStatus() {
             try {
-                final String url = "http://toolserver.org/~master/osmjson/getGeoJSON.php?action=check"
+                final String url = "https://tools.wmflabs.org/wiwosm/osmjson/getGeoJSON.php?action=check"
                         + "&lang=" + wikipediaLang
                         + "&article=" + encodeURL(wikipediaArticle);
@@ -314,5 +314,5 @@
 
         public String getBrowserUrl() {
-            return "http://" + wikipediaLang + ".wikipedia.org/wiki/"
+            return "https://" + wikipediaLang + ".wikipedia.org/wiki/"
                     + encodeURL(wikipediaArticle.replace(" ", "_"));
         }
Index: /applications/editors/josm/plugins/wikipedia/test/org/wikipedia/WikipediaAppTest.java
===================================================================
--- /applications/editors/josm/plugins/wikipedia/test/org/wikipedia/WikipediaAppTest.java	(revision 30447)
+++ /applications/editors/josm/plugins/wikipedia/test/org/wikipedia/WikipediaAppTest.java	(revision 30448)
@@ -112,5 +112,5 @@
     public void testGetBrowserUrl() {
         final WikipediaEntry entry = new WikipediaEntry("Sternheim & Emanuel", "de", "Sternheim & Emanuel");
-        assertThat(entry.getBrowserUrl(), is("http://de.wikipedia.org/wiki/Sternheim_%26_Emanuel"));
+        assertThat(entry.getBrowserUrl(), is("https://de.wikipedia.org/wiki/Sternheim_%26_Emanuel"));
     }