Index: applications/editors/josm/plugins/tag2link/resources/tag2link_sources.xml
===================================================================
--- applications/editors/josm/plugins/tag2link/resources/tag2link_sources.xml	(revision 34810)
+++ applications/editors/josm/plugins/tag2link/resources/tag2link_sources.xml	(revision 34811)
@@ -54,5 +54,5 @@
         </rule>
         <rule>
-            <condition k="wikidata" />
+            <condition k="(operator:|network:|brand:|architect:|artist:|subject:|name:etymology:)?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 34810)
+++ applications/editors/josm/plugins/tag2link/test/unit/org/openstreetmap/josm/plugins/tag2link/Tag2LinkRuleCheckerTest.java	(revision 34811)
@@ -13,13 +13,20 @@
 
     @BeforeClass
-    public static void load() throws Exception {
+    public static void load() {
         Tag2LinkRuleChecker.init();
     }
 
     @Test
-    public void testImageCommons() throws Exception {
+    public void testImageCommons() {
         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);
     }
+
+    @Test
+    public void testBrandWikidata() {
+        final Collection<Link> links = Tag2LinkRuleChecker.getLinks(new Tag("brand:wikidata", "Q259340"));
+        assertEquals(1, links.size());
+        assertEquals("https://www.wikidata.org/wiki/Q259340", links.iterator().next().url);
+    }
 }