Index: applications/editors/josm/plugins/tag2link/resources/tag2link_sources.xml
===================================================================
--- applications/editors/josm/plugins/tag2link/resources/tag2link_sources.xml	(revision 35143)
+++ applications/editors/josm/plugins/tag2link/resources/tag2link_sources.xml	(revision 35144)
@@ -54,5 +54,5 @@
         </rule>
     </src>
-    
+
     <src name="Wikipedia">
         <rule>
@@ -61,5 +61,5 @@
         </rule>
         <rule>
-            <condition k="(operator:|network:|brand:|architect:|artist:|subject:|name:etymology:)?wikidata" />
+            <condition k="(.*:)?wikidata" />
             <link name="View Wikidata page" href="https://www.wikidata.org/wiki/%v%" />
         </rule>
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 35143)
+++ applications/editors/josm/plugins/tag2link/test/unit/org/openstreetmap/josm/plugins/tag2link/Tag2LinkRuleCheckerTest.java	(revision 35144)
@@ -30,3 +30,10 @@
         assertEquals("https://www.wikidata.org/wiki/Q259340", links.iterator().next().url);
     }
+
+    @Test
+    public void testArchipelagoWikidata() {
+        final Collection<Link> links = Tag2LinkRuleChecker.getLinks(new Tag("archipelago:wikidata", "Q756987"));
+        assertEquals(1, links.size());
+        assertEquals("https://www.wikidata.org/wiki/Q756987", links.iterator().next().url);
+    }
 }