--- tvheadend.orig/src/service_mapper.c	2015-06-24 15:57:16.853312513 +0200
+++ tvheadend/src/service_mapper.c	2015-06-24 15:50:34.176654256 +0200
@@ -251,9 +251,14 @@
     }
 
     /* Provider */
-    if (service_mapper_conf.provider_tags)
-      if ((prov = s->s_provider_name(s)))
+    if (service_mapper_conf.provider_tags) {
+      if ((prov = s->s_provider_name(s))) {
         channel_tag_map(channel_tag_find_by_name(prov, 1), chn, chn);
+      }
+        source_info_t si;
+        s->s_setsourceinfo(s, &si);
+        channel_tag_map(channel_tag_find_by_name(si.si_network, 1), chn, chn);
+    }
 
     /* save */
     idnode_notify_changed(&chn->ch_id);