Index: /applications/editors/josm/plugins/tag2link/src/org/openstreetmap/josm/plugins/tag2link/Tag2LinkRuleChecker.java
===================================================================
--- /applications/editors/josm/plugins/tag2link/src/org/openstreetmap/josm/plugins/tag2link/Tag2LinkRuleChecker.java	(revision 31909)
+++ /applications/editors/josm/plugins/tag2link/src/org/openstreetmap/josm/plugins/tag2link/Tag2LinkRuleChecker.java	(revision 31910)
@@ -110,5 +110,5 @@
                 try {
                     // Special hack for Wikipedia that prevents spaces being replaced by "+" characters, but by "_"
-                    if (s.contains("wikipedia.")) {
+                    if (s.contains("wikipedia.") || s.contains("commons.wikimedia.org")) {
                         val = val.replaceAll(" ", "_");
                     }
Index: /applications/editors/josm/plugins/tag2link/test/unit/org/openstreetmap/josm/plugins/tag2link/Tag2LinkRuleCheckerTest.java
===================================================================
--- /applications/editors/josm/plugins/tag2link/test/unit/org/openstreetmap/josm/plugins/tag2link/Tag2LinkRuleCheckerTest.java	(revision 31910)
+++ /applications/editors/josm/plugins/tag2link/test/unit/org/openstreetmap/josm/plugins/tag2link/Tag2LinkRuleCheckerTest.java	(revision 31910)
@@ -0,0 +1,25 @@
+package org.openstreetmap.josm.plugins.tag2link;
+
+import static org.junit.Assert.*;
+
+import java.util.Collection;
+
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.openstreetmap.josm.data.osm.Tag;
+import org.openstreetmap.josm.plugins.tag2link.data.Link;
+
+public class Tag2LinkRuleCheckerTest {
+
+    @BeforeClass
+    public static void load() throws Exception {
+        Tag2LinkRuleChecker.init();
+    }
+
+    @Test
+    public void testImageCommons() throws Exception {
+        final Collection<Link> links = Tag2LinkRuleChecker.getLinks(new Tag("image", "File:Witten Brücke Gasstraße.jpg"));
+        assertEquals(1, links.size());
+        assertEquals("https://commons.wikimedia.org/wiki/File%3AWitten_Br%C3%BCcke_Gasstra%C3%9Fe.jpg", links.iterator().next().url);
+    }
+}