diff --git a/pungi/gather.py b/pungi/gather.py
index 378649d7..4d155e5b 100644
--- a/pungi/gather.py
+++ b/pungi/gather.py
@@ -424,7 +424,7 @@ class Pungi(PungiBase):
     def _filtersrcdebug(self, po):
         """Filter out package objects that are of 'src' arch."""
 
-        if po.arch == 'src' or 'debuginfo' in po.name:
+        if po.arch == 'src' or pungi.util.pkg_is_debug(po):
             return False
 
         return True
diff --git a/tests/fixtures/repos/repo/repodata/44d7c373789c0ab11978a23af58d5a5b25b7a6c6efb07cef06aebce015b0be44-primary.sqlite.bz2 b/tests/fixtures/repos/repo/repodata/44d7c373789c0ab11978a23af58d5a5b25b7a6c6efb07cef06aebce015b0be44-primary.sqlite.bz2
new file mode 100644
index 00000000..34d3b3df
Binary files /dev/null and b/tests/fixtures/repos/repo/repodata/44d7c373789c0ab11978a23af58d5a5b25b7a6c6efb07cef06aebce015b0be44-primary.sqlite.bz2 differ
diff --git a/tests/fixtures/repos/repo/repodata/4c995ec134786879990c65dbb2e7e775ff4b532430b2c16906601403d42ffd9e-filelists.xml.gz b/tests/fixtures/repos/repo/repodata/4c995ec134786879990c65dbb2e7e775ff4b532430b2c16906601403d42ffd9e-filelists.xml.gz
deleted file mode 100644
index bf61e91b..00000000
Binary files a/tests/fixtures/repos/repo/repodata/4c995ec134786879990c65dbb2e7e775ff4b532430b2c16906601403d42ffd9e-filelists.xml.gz and /dev/null differ
diff --git a/tests/fixtures/repos/repo/repodata/533b28e88605f4f7885c9960e4853880ea1aef04520789b32f4b57aeb753256b-primary.xml.gz b/tests/fixtures/repos/repo/repodata/533b28e88605f4f7885c9960e4853880ea1aef04520789b32f4b57aeb753256b-primary.xml.gz
deleted file mode 100644
index 5b1453ad..00000000
Binary files a/tests/fixtures/repos/repo/repodata/533b28e88605f4f7885c9960e4853880ea1aef04520789b32f4b57aeb753256b-primary.xml.gz and /dev/null differ
diff --git a/tests/fixtures/repos/repo/repodata/9437426ee80321bd23920f8385fb60f86ad926c0d40153adfec217209dfccf04-filelists.xml.gz b/tests/fixtures/repos/repo/repodata/9437426ee80321bd23920f8385fb60f86ad926c0d40153adfec217209dfccf04-filelists.xml.gz
new file mode 100644
index 00000000..797b2afc
Binary files /dev/null and b/tests/fixtures/repos/repo/repodata/9437426ee80321bd23920f8385fb60f86ad926c0d40153adfec217209dfccf04-filelists.xml.gz differ
diff --git a/tests/fixtures/repos/repo/repodata/ad397a2c81b435e542abd99d03cee9a7a656e2bd4f0f5709b809a3b1e63a25f9-filelists.sqlite.bz2 b/tests/fixtures/repos/repo/repodata/ad397a2c81b435e542abd99d03cee9a7a656e2bd4f0f5709b809a3b1e63a25f9-filelists.sqlite.bz2
deleted file mode 100644
index 78b346e8..00000000
Binary files a/tests/fixtures/repos/repo/repodata/ad397a2c81b435e542abd99d03cee9a7a656e2bd4f0f5709b809a3b1e63a25f9-filelists.sqlite.bz2 and /dev/null differ
diff --git a/tests/fixtures/repos/repo/repodata/b86f54540738fac2e1cdf66ee218a7be34f33446dbd09c20d538f61bceacb47b-filelists.sqlite.bz2 b/tests/fixtures/repos/repo/repodata/b86f54540738fac2e1cdf66ee218a7be34f33446dbd09c20d538f61bceacb47b-filelists.sqlite.bz2
new file mode 100644
index 00000000..c9306446
Binary files /dev/null and b/tests/fixtures/repos/repo/repodata/b86f54540738fac2e1cdf66ee218a7be34f33446dbd09c20d538f61bceacb47b-filelists.sqlite.bz2 differ
diff --git a/tests/fixtures/repos/repo/repodata/d08dfb319143d0105b89413a47a0b2c8e593177f1c7975371c8205830022d53f-primary.sqlite.bz2 b/tests/fixtures/repos/repo/repodata/d08dfb319143d0105b89413a47a0b2c8e593177f1c7975371c8205830022d53f-primary.sqlite.bz2
deleted file mode 100644
index 93807724..00000000
Binary files a/tests/fixtures/repos/repo/repodata/d08dfb319143d0105b89413a47a0b2c8e593177f1c7975371c8205830022d53f-primary.sqlite.bz2 and /dev/null differ
diff --git a/tests/fixtures/repos/repo/repodata/d98c8266ea319fb88cd516de4c2916e49d5d2e310fc6c236522ea6c250a8a1fd-other.sqlite.bz2 b/tests/fixtures/repos/repo/repodata/d98c8266ea319fb88cd516de4c2916e49d5d2e310fc6c236522ea6c250a8a1fd-other.sqlite.bz2
new file mode 100644
index 00000000..060a3193
Binary files /dev/null and b/tests/fixtures/repos/repo/repodata/d98c8266ea319fb88cd516de4c2916e49d5d2e310fc6c236522ea6c250a8a1fd-other.sqlite.bz2 differ
diff --git a/tests/fixtures/repos/repo/repodata/e91bb0df9fa5fa4eb0c06612415333156fff862fb654cc8d3aaf2ba1cee7675d-other.xml.gz b/tests/fixtures/repos/repo/repodata/e91bb0df9fa5fa4eb0c06612415333156fff862fb654cc8d3aaf2ba1cee7675d-other.xml.gz
new file mode 100644
index 00000000..f8dd78ad
Binary files /dev/null and b/tests/fixtures/repos/repo/repodata/e91bb0df9fa5fa4eb0c06612415333156fff862fb654cc8d3aaf2ba1cee7675d-other.xml.gz differ
diff --git a/tests/fixtures/repos/repo/repodata/ea136c790c7e3994e27d50064c8ca6837328eed70dc01707d0bdd41f06757f36-primary.xml.gz b/tests/fixtures/repos/repo/repodata/ea136c790c7e3994e27d50064c8ca6837328eed70dc01707d0bdd41f06757f36-primary.xml.gz
new file mode 100644
index 00000000..0ed7217e
Binary files /dev/null and b/tests/fixtures/repos/repo/repodata/ea136c790c7e3994e27d50064c8ca6837328eed70dc01707d0bdd41f06757f36-primary.xml.gz differ
diff --git a/tests/fixtures/repos/repo/repodata/ea44f7f31f7c5e34380b842fc69cef78bb47c711fbfdb22bd27b3e8dde88e0cf-other.sqlite.bz2 b/tests/fixtures/repos/repo/repodata/ea44f7f31f7c5e34380b842fc69cef78bb47c711fbfdb22bd27b3e8dde88e0cf-other.sqlite.bz2
deleted file mode 100644
index 23c24a22..00000000
Binary files a/tests/fixtures/repos/repo/repodata/ea44f7f31f7c5e34380b842fc69cef78bb47c711fbfdb22bd27b3e8dde88e0cf-other.sqlite.bz2 and /dev/null differ
diff --git a/tests/fixtures/repos/repo/repodata/feafc4d56b8fb78d13f439739f9d29b9be03a916c22e6685c62f0cd675895c93-other.xml.gz b/tests/fixtures/repos/repo/repodata/feafc4d56b8fb78d13f439739f9d29b9be03a916c22e6685c62f0cd675895c93-other.xml.gz
deleted file mode 100644
index bd83f38a..00000000
Binary files a/tests/fixtures/repos/repo/repodata/feafc4d56b8fb78d13f439739f9d29b9be03a916c22e6685c62f0cd675895c93-other.xml.gz and /dev/null differ
diff --git a/tests/fixtures/repos/repo/repodata/repomd.xml b/tests/fixtures/repos/repo/repodata/repomd.xml
index dbf92186..d70b4506 100644
--- a/tests/fixtures/repos/repo/repodata/repomd.xml
+++ b/tests/fixtures/repos/repo/repodata/repomd.xml
@@ -1,68 +1,68 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <repomd xmlns="http://linux.duke.edu/metadata/repo" xmlns:rpm="http://linux.duke.edu/metadata/rpm">
-  <revision>1485161230</revision>
+  <revision>1501137081</revision>
   <data type="primary">
-    <checksum type="sha256">533b28e88605f4f7885c9960e4853880ea1aef04520789b32f4b57aeb753256b</checksum>
-    <open-checksum type="sha256">ffa22f7a92f2fa74630991aca101d92199a4b94ed2ba603e3ea1b387a9566787</open-checksum>
-    <location href="repodata/533b28e88605f4f7885c9960e4853880ea1aef04520789b32f4b57aeb753256b-primary.xml.gz"/>
-    <timestamp>1485161230</timestamp>
-    <size>34095</size>
-    <open-size>466292</open-size>
+    <checksum type="sha256">ea136c790c7e3994e27d50064c8ca6837328eed70dc01707d0bdd41f06757f36</checksum>
+    <open-checksum type="sha256">8cff34417dca37ff1d5a64f42c97558d4244d9e14a573b3b7de1d2fa58b87156</open-checksum>
+    <location href="repodata/ea136c790c7e3994e27d50064c8ca6837328eed70dc01707d0bdd41f06757f36-primary.xml.gz"/>
+    <timestamp>1501137081</timestamp>
+    <size>36232</size>
+    <open-size>486734</open-size>
   </data>
   <data type="filelists">
-    <checksum type="sha256">4c995ec134786879990c65dbb2e7e775ff4b532430b2c16906601403d42ffd9e</checksum>
-    <open-checksum type="sha256">8e4c5a5bc1feb12efda69e702f7b10484feca644a252e47380c45468e5607893</open-checksum>
-    <location href="repodata/4c995ec134786879990c65dbb2e7e775ff4b532430b2c16906601403d42ffd9e-filelists.xml.gz"/>
-    <timestamp>1485161230</timestamp>
-    <size>20860</size>
-    <open-size>77731</open-size>
+    <checksum type="sha256">9437426ee80321bd23920f8385fb60f86ad926c0d40153adfec217209dfccf04</checksum>
+    <open-checksum type="sha256">0a6ebdff378b4d809a0026e371beccb0a02104b10ce3370debf23011ed10ce90</open-checksum>
+    <location href="repodata/9437426ee80321bd23920f8385fb60f86ad926c0d40153adfec217209dfccf04-filelists.xml.gz"/>
+    <timestamp>1501137081</timestamp>
+    <size>21790</size>
+    <open-size>81227</open-size>
   </data>
   <data type="other">
-    <checksum type="sha256">feafc4d56b8fb78d13f439739f9d29b9be03a916c22e6685c62f0cd675895c93</checksum>
-    <open-checksum type="sha256">f4d2786206236d1dcab923430b63be2b74efe8945b219c5633a2d12d2cd42714</open-checksum>
-    <location href="repodata/feafc4d56b8fb78d13f439739f9d29b9be03a916c22e6685c62f0cd675895c93-other.xml.gz"/>
-    <timestamp>1485161230</timestamp>
-    <size>20924</size>
-    <open-size>124502</open-size>
+    <checksum type="sha256">e91bb0df9fa5fa4eb0c06612415333156fff862fb654cc8d3aaf2ba1cee7675d</checksum>
+    <open-checksum type="sha256">ce4542166fa099eff840191be53cca08f248b540e979d58c228ce2cef4bf9902</open-checksum>
+    <location href="repodata/e91bb0df9fa5fa4eb0c06612415333156fff862fb654cc8d3aaf2ba1cee7675d-other.xml.gz"/>
+    <timestamp>1501137081</timestamp>
+    <size>21852</size>
+    <open-size>130245</open-size>
   </data>
   <data type="primary_db">
-    <checksum type="sha256">d08dfb319143d0105b89413a47a0b2c8e593177f1c7975371c8205830022d53f</checksum>
-    <open-checksum type="sha256">7d7e06557c5e72c26da77d083535ff58eaae5b3b39a9b71290e77c4ad8f061ef</open-checksum>
-    <location href="repodata/d08dfb319143d0105b89413a47a0b2c8e593177f1c7975371c8205830022d53f-primary.sqlite.bz2"/>
-    <timestamp>1485161230</timestamp>
-    <size>60355</size>
-    <open-size>385024</open-size>
+    <checksum type="sha256">44d7c373789c0ab11978a23af58d5a5b25b7a6c6efb07cef06aebce015b0be44</checksum>
+    <open-checksum type="sha256">578f192bcc52487ab45b853e3c92bffc78bb199208371eadd34645360c38cef2</open-checksum>
+    <location href="repodata/44d7c373789c0ab11978a23af58d5a5b25b7a6c6efb07cef06aebce015b0be44-primary.sqlite.bz2"/>
+    <timestamp>1501137081</timestamp>
+    <size>63016</size>
+    <open-size>389120</open-size>
     <database_version>10</database_version>
   </data>
   <data type="filelists_db">
-    <checksum type="sha256">ad397a2c81b435e542abd99d03cee9a7a656e2bd4f0f5709b809a3b1e63a25f9</checksum>
-    <open-checksum type="sha256">4ce4ef65edc7d09f2b04e693b25c8165ad367b2a58b1e339d1c3ed29726fbd80</open-checksum>
-    <location href="repodata/ad397a2c81b435e542abd99d03cee9a7a656e2bd4f0f5709b809a3b1e63a25f9-filelists.sqlite.bz2"/>
-    <timestamp>1485161230</timestamp>
-    <size>26824</size>
+    <checksum type="sha256">b86f54540738fac2e1cdf66ee218a7be34f33446dbd09c20d538f61bceacb47b</checksum>
+    <open-checksum type="sha256">b8ab6e3689cce6a8391293a11e037da6bf7b5face21ed64d80877709800352ef</open-checksum>
+    <location href="repodata/b86f54540738fac2e1cdf66ee218a7be34f33446dbd09c20d538f61bceacb47b-filelists.sqlite.bz2"/>
+    <timestamp>1501137081</timestamp>
+    <size>28094</size>
     <open-size>94208</open-size>
     <database_version>10</database_version>
   </data>
   <data type="other_db">
-    <checksum type="sha256">ea44f7f31f7c5e34380b842fc69cef78bb47c711fbfdb22bd27b3e8dde88e0cf</checksum>
-    <open-checksum type="sha256">ce923cd27d43422f7e22e728e7e652af8a36772211f35f0868f01acef926391c</open-checksum>
-    <location href="repodata/ea44f7f31f7c5e34380b842fc69cef78bb47c711fbfdb22bd27b3e8dde88e0cf-other.sqlite.bz2"/>
-    <timestamp>1485161230</timestamp>
-    <size>31113</size>
-    <open-size>122880</open-size>
+    <checksum type="sha256">d98c8266ea319fb88cd516de4c2916e49d5d2e310fc6c236522ea6c250a8a1fd</checksum>
+    <open-checksum type="sha256">bb732dae3bb6147fe01c433e584260efea83e187ed924f992bcd9eb9d02279c2</open-checksum>
+    <location href="repodata/d98c8266ea319fb88cd516de4c2916e49d5d2e310fc6c236522ea6c250a8a1fd-other.sqlite.bz2"/>
+    <timestamp>1501137081</timestamp>
+    <size>32564</size>
+    <open-size>131072</open-size>
     <database_version>10</database_version>
   </data>
   <data type="group">
     <checksum type="sha256">cd2e022a3f1163bed5dd38328a2c0bd7a8db1589a9e67b25c6341941914e1077</checksum>
     <location href="repodata/cd2e022a3f1163bed5dd38328a2c0bd7a8db1589a9e67b25c6341941914e1077-dummy-comps.xml"/>
-    <timestamp>1485161230</timestamp>
+    <timestamp>1501137081</timestamp>
     <size>5178</size>
   </data>
   <data type="group_gz">
     <checksum type="sha256">2f8cc4b5cf852eca9838393db012ad4e494ccea437ffbbbf95e110a388e15f35</checksum>
     <open-checksum type="sha256">cd2e022a3f1163bed5dd38328a2c0bd7a8db1589a9e67b25c6341941914e1077</open-checksum>
     <location href="repodata/2f8cc4b5cf852eca9838393db012ad4e494ccea437ffbbbf95e110a388e15f35-dummy-comps.xml.gz"/>
-    <timestamp>1485161230</timestamp>
+    <timestamp>1501137081</timestamp>
     <size>1244</size>
     <open-size>5178</open-size>
   </data>
diff --git a/tests/test_gather.py b/tests/test_gather.py
index ffa990de..f158b0b6 100644
--- a/tests/test_gather.py
+++ b/tests/test_gather.py
@@ -144,6 +144,7 @@ class DepsolvingBase(object):
         ])
         self.assertItemsEqual(pkg_map["debuginfo"], [
             "dummy-bash-debuginfo-4.2.37-6.ppc64.rpm",
+            "dummy-bash-debugsource-4.2.37-6.ppc64.rpm",
             "dummy-glibc-debuginfo-2.14-5.ppc.rpm",
             "dummy-glibc-debuginfo-2.14-5.ppc64.rpm",
             "dummy-glibc-debuginfo-common-2.14-5.ppc.rpm",
@@ -190,6 +191,7 @@ class DepsolvingBase(object):
         ])
         self.assertItemsEqual(pkg_map["debuginfo"], [
             "dummy-bash-debuginfo-4.2.37-6.x86_64.rpm",
+            "dummy-bash-debugsource-4.2.37-6.x86_64.rpm",
             "dummy-glibc-debuginfo-2.14-5.x86_64.rpm",
             "dummy-glibc-debuginfo-common-2.14-5.x86_64.rpm",
         ])
@@ -219,6 +221,7 @@ class DepsolvingBase(object):
         ])
         self.assertItemsEqual(pkg_map["debuginfo"], [
             "dummy-bash-debuginfo-4.2.37-6.s390x.rpm",
+            "dummy-bash-debugsource-4.2.37-6.s390x.rpm",
             "dummy-glibc-debuginfo-2.14-5.s390x.rpm",
             "dummy-glibc-debuginfo-common-2.14-5.s390x.rpm",
         ])
@@ -252,7 +255,9 @@ class DepsolvingBase(object):
         ])
         self.assertItemsEqual(pkg_map["debuginfo"], [
             "dummy-bash-debuginfo-4.2.37-6.i686.rpm",
+            "dummy-bash-debugsource-4.2.37-6.i686.rpm",
             "dummy-bash-debuginfo-4.2.37-6.x86_64.rpm",
+            "dummy-bash-debugsource-4.2.37-6.x86_64.rpm",
             "dummy-glibc-debuginfo-2.14-5.i686.rpm",
             "dummy-glibc-debuginfo-2.14-5.x86_64.rpm",
             "dummy-glibc-debuginfo-common-2.14-5.i686.rpm",
@@ -598,6 +603,7 @@ class DepsolvingBase(object):
         ])
         self.assertItemsEqual(pkg_map["debuginfo"], [
             "dummy-bash-debuginfo-4.2.37-6.x86_64.rpm",
+            "dummy-bash-debugsource-4.2.37-6.x86_64.rpm",
             "Dummy-firefox-debuginfo-16.0.1-1.x86_64.rpm",
             "dummy-glibc-debuginfo-2.14-5.x86_64.rpm",          # Important
             "dummy-glibc-debuginfo-common-2.14-5.x86_64.rpm",   # Important
@@ -709,6 +715,7 @@ class DepsolvingBase(object):
         ])
         self.assertItemsEqual(pkg_map["debuginfo"], [
             "dummy-bash-debuginfo-4.2.37-6.x86_64.rpm",
+            "dummy-bash-debugsource-4.2.37-6.x86_64.rpm",
             "Dummy-firefox-debuginfo-16.0.1-1.x86_64.rpm",
             "dummy-glibc-debuginfo-2.14-5.x86_64.rpm",
             "dummy-glibc-debuginfo-common-2.14-5.x86_64.rpm",
@@ -775,6 +782,7 @@ class DepsolvingBase(object):
         ])
         self.assertItemsEqual(pkg_map["debuginfo"], [
             "dummy-bash-debuginfo-4.2.37-6.i686.rpm",
+            "dummy-bash-debugsource-4.2.37-6.i686.rpm",
             "dummy-glibc-debuginfo-2.14-5.i686.rpm",
             "dummy-glibc-debuginfo-2.14-5.x86_64.rpm",
             "dummy-glibc-debuginfo-common-2.14-5.i686.rpm",
@@ -832,6 +840,7 @@ class DepsolvingBase(object):
         ])
         self.assertItemsEqual(pkg_map["debuginfo"], [
             "dummy-bash-debuginfo-4.2.37-6.i686.rpm",
+            "dummy-bash-debugsource-4.2.37-6.i686.rpm",
             "dummy-glibc-debuginfo-2.14-5.i686.rpm",
             "dummy-glibc-debuginfo-2.14-5.x86_64.rpm",
             "dummy-glibc-debuginfo-common-2.14-5.i686.rpm",
@@ -862,6 +871,7 @@ class DepsolvingBase(object):
         ])
         self.assertItemsEqual(pkg_map["debuginfo"], [
             "dummy-bash-debuginfo-4.2.37-6.i686.rpm",
+            "dummy-bash-debugsource-4.2.37-6.i686.rpm",
             "dummy-glibc-debuginfo-2.14-5.i686.rpm",
             "dummy-glibc-debuginfo-2.14-5.x86_64.rpm",
             "dummy-glibc-debuginfo-common-2.14-5.i686.rpm",
@@ -896,7 +906,9 @@ class DepsolvingBase(object):
         ])
         self.assertItemsEqual(pkg_map["debuginfo"], [
             "dummy-bash-debuginfo-4.2.37-6.i686.rpm",
+            "dummy-bash-debugsource-4.2.37-6.i686.rpm",
             "dummy-bash-debuginfo-4.2.37-6.x86_64.rpm",
+            "dummy-bash-debugsource-4.2.37-6.x86_64.rpm",
             "dummy-glibc-debuginfo-2.14-5.i686.rpm",
             "dummy-glibc-debuginfo-2.14-5.x86_64.rpm",
             "dummy-glibc-debuginfo-common-2.14-5.i686.rpm",
@@ -930,6 +942,7 @@ class DepsolvingBase(object):
         ])
         self.assertItemsEqual(pkg_map["debuginfo"], [
             "dummy-bash-debuginfo-4.2.37-6.i686.rpm",
+            "dummy-bash-debugsource-4.2.37-6.i686.rpm",
             # "dummy-glibc-debuginfo-2.14-5.i686.rpm",
             "dummy-glibc-debuginfo-2.14-5.x86_64.rpm",
             # "dummy-glibc-debuginfo-common-2.14-5.i686.rpm",
@@ -966,6 +979,7 @@ class DepsolvingBase(object):
         ])
         self.assertItemsEqual(pkg_map["debuginfo"], [
             "dummy-bash-debuginfo-4.2.37-6.x86_64.rpm",
+            "dummy-bash-debugsource-4.2.37-6.x86_64.rpm",
             "dummy-glibc-debuginfo-2.14-5.i686.rpm",
             "dummy-glibc-debuginfo-2.14-5.x86_64.rpm",
             "dummy-glibc-debuginfo-common-2.14-5.i686.rpm",
@@ -1237,6 +1251,7 @@ class DepsolvingBase(object):
         ])
         self.assertItemsEqual(pkg_map["debuginfo"], [
             "dummy-bash-debuginfo-4.2.37-6.x86_64.rpm",
+            "dummy-bash-debugsource-4.2.37-6.x86_64.rpm",
         ])
 
     def test_bash_fulltree_nodeps(self):
@@ -1258,6 +1273,7 @@ class DepsolvingBase(object):
         ])
         self.assertItemsEqual(pkg_map["debuginfo"], [
             "dummy-bash-debuginfo-4.2.37-6.x86_64.rpm",
+            "dummy-bash-debugsource-4.2.37-6.x86_64.rpm",
         ])
 
     def test_lookaside_empty(self):
@@ -1441,6 +1457,7 @@ class DepsolvingBase(object):
         ])
         self.assertItemsEqual(pkg_map["debuginfo"], [
             "dummy-bash-debuginfo-4.2.37-6.i686.rpm",
+            "dummy-bash-debugsource-4.2.37-6.i686.rpm",
             "dummy-glibc-debuginfo-2.14-5.i686.rpm",
             "dummy-glibc-debuginfo-common-2.14-5.i686.rpm",
             "dummy-glibc-debuginfo-2.14-5.x86_64.rpm",