Index: trunk/src/org/openstreetmap/josm/tools/Tag2Link.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/Tag2Link.java	(revision 17904)
+++ 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;
     }