Index: /trunk/src/org/openstreetmap/josm/tools/Tag2Link.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/tools/Tag2Link.java	(revision 17908)
+++ /trunk/src/org/openstreetmap/josm/tools/Tag2Link.java	(revision 17909)
@@ -27,5 +27,4 @@
 import javax.json.JsonValue;
 
-import com.google.gdata.util.common.base.PercentEscaper;
 import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
 import org.openstreetmap.josm.data.osm.OsmUtils;
@@ -218,5 +217,7 @@
 
     private static String getWikimediaCommonsUrl(String i) {
-        return "https://commons.wikimedia.org/wiki/" + new PercentEscaper(PercentEscaper.SAFEPATHCHARS_URLENCODER, false).escape(i);
+        i = i.replace(' ', '_');
+        i = Utils.encodeUrl(i);
+        return "https://commons.wikimedia.org/wiki/" + i;
     }
 
Index: /trunk/test/unit/org/openstreetmap/josm/tools/Tag2LinkTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/tools/Tag2LinkTest.java	(revision 17908)
+++ /trunk/test/unit/org/openstreetmap/josm/tools/Tag2LinkTest.java	(revision 17909)
@@ -87,10 +87,10 @@
     void testImageCommonsImage() {
         Tag2Link.getLinksForTag("image", "File:Witten Brücke Gasstraße.jpg", this::addLink);
-        checkLinks("View image on Wikimedia Commons // https://commons.wikimedia.org/wiki/File:Witten%20Br%C3%BCcke%20Gasstra%C3%9Fe.jpg");
+        checkLinks("View image on Wikimedia Commons // https://commons.wikimedia.org/wiki/File%3AWitten_Br%C3%BCcke_Gasstra%C3%9Fe.jpg");
         links.clear();
         // non-regression test for #19754
         Tag2Link.getLinksForTag("image", "File:Foo.jpg;File:Bar.jpg", this::addLink);
-        checkLinks("View image on Wikimedia Commons // https://commons.wikimedia.org/wiki/File:Foo.jpg",
-                "View image on Wikimedia Commons // https://commons.wikimedia.org/wiki/File:Bar.jpg");
+        checkLinks("View image on Wikimedia Commons // https://commons.wikimedia.org/wiki/File%3AFoo.jpg",
+                "View image on Wikimedia Commons // https://commons.wikimedia.org/wiki/File%3ABar.jpg");
         links.clear();
         // non-regression test for #19771
@@ -98,5 +98,5 @@
         checkLinks("View image on Wikimedia Commons // " +
                 "https://commons.wikimedia.org/wiki/" +
-                "File:C%C3%B4te%20de%20granite%20rose%20-%20Tr%C3%A9gastel%20%C3%A0%20Ploumanac'h%20-%2020190723%20-%20025.jpg");
+                "File%3AC%C3%B4te_de_granite_rose_-_Tr%C3%A9gastel_%C3%A0_Ploumanac%27h_-_20190723_-_025.jpg");
     }
 
@@ -107,5 +107,5 @@
     void testImageCommonsCategory() {
         Tag2Link.getLinksForTag("image", "category:JOSM", this::addLink);
-        checkLinks("View category on Wikimedia Commons // https://commons.wikimedia.org/wiki/category:JOSM");
+        checkLinks("View category on Wikimedia Commons // https://commons.wikimedia.org/wiki/category%3AJOSM");
     }