diff --git a/pungi/phases/pkgset/sources/source_koji.py b/pungi/phases/pkgset/sources/source_koji.py
index 450d271e..5652fabd 100644
--- a/pungi/phases/pkgset/sources/source_koji.py
+++ b/pungi/phases/pkgset/sources/source_koji.py
@@ -672,6 +672,12 @@ def populate_global_pkgset(compose, koji_wrapper, path_prefix, event):
             )
             for variant in compose.all_variants.values():
                 if compose_tag in variant_tags[variant]:
+
+                    # If it's a modular tag, store the package set for the module.
+                    for nsvc, koji_tag in variant.module_uid_to_koji_tag.items():
+                        if compose_tag == koji_tag:
+                            variant.nsvc_to_pkgset[nsvc] = pkgset
+
                     # Optimization for case where we have just single compose
                     # tag - we do not have to merge in this case...
                     if len(variant_tags[variant]) == 1:
diff --git a/pungi/wrappers/variants.py b/pungi/wrappers/variants.py
index 36bc6182..5689d346 100755
--- a/pungi/wrappers/variants.py
+++ b/pungi/wrappers/variants.py
@@ -267,6 +267,7 @@ class Variant(object):
         self.mmds = []
         self.arch_mmds = {}
         self.module_uid_to_koji_tag = {}
+        self.nsvc_to_pkgset = {}
 
     def __getitem__(self, name):
         return self.variants[name]
diff --git a/tests/helpers.py b/tests/helpers.py
index 8405d73b..b2b5611a 100644
--- a/tests/helpers.py
+++ b/tests/helpers.py
@@ -43,6 +43,7 @@ class MockVariant(mock.Mock):
         self.pkgset = mock.Mock(rpms_by_arch={})
         self.modules = None
         self.name = name
+        self.nsvc_to_pkgset = {}
 
     def __str__(self):
         return self.uid