diff --git a/comps-f19.xml.in b/comps-f19.xml.in
index e6424c93..eb80cf16 100644
--- a/comps-f19.xml.in
+++ b/comps-f19.xml.in
@@ -2454,6 +2454,12 @@
       <packagereq type="default">gnu-free-mono-fonts</packagereq>
       <packagereq type="default">gnu-free-sans-fonts</packagereq>
       <packagereq type="default">gnu-free-serif-fonts</packagereq>
+      <packagereq type="default">google-noto-sans-lisu-fonts</packagereq>
+      <packagereq type="default">google-noto-sans-mandaic-fonts</packagereq>
+      <packagereq type="default">google-noto-sans-meeteimayek-fonts</packagereq>
+      <packagereq type="default">google-noto-sans-tagalog-fonts</packagereq>
+      <packagereq type="default">google-noto-sans-tai-tham-fonts</packagereq>
+      <packagereq type="default">google-noto-sans-tai-viet-fonts</packagereq>
       <packagereq type="default">jomolhari-fonts</packagereq>
       <packagereq type="default">khmeros-base-fonts</packagereq>
       <packagereq type="default">liberation-mono-fonts</packagereq>
@@ -2594,24 +2600,59 @@
       <packagereq type="optional">google-droid-sans-mono-fonts</packagereq>
       <packagereq type="optional">google-droid-serif-fonts</packagereq>
       <packagereq type="optional">google-noto-sans-armenian-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-avestan-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-bengali-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-bengali-ui-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-brahmi-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-carian-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-cherokee-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-coptic-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-deseret-fonts</packagereq>
       <packagereq type="optional">google-noto-sans-devanagari-fonts</packagereq>
       <packagereq type="optional">google-noto-sans-devanagari-ui-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-egyptian-hieroglyphs-fonts</packagereq>
       <packagereq type="optional">google-noto-sans-ethiopic-fonts</packagereq>
       <packagereq type="optional">google-noto-sans-fonts</packagereq>
       <packagereq type="optional">google-noto-sans-georgian-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-glagolitic-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-gujarati-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-gujarati-ui-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-hanunno-fonts</packagereq>
       <packagereq type="optional">google-noto-sans-hebrew-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-imperial-aramaic-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-kaithi-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-kannada-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-kannada-ui-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-kayah-li-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-kharoshthi-fonts</packagereq>
       <packagereq type="optional">google-noto-sans-khmer-fonts</packagereq>
       <packagereq type="optional">google-noto-sans-khmer-ui-fonts</packagereq>
       <packagereq type="optional">google-noto-sans-lao-fonts</packagereq>
       <packagereq type="optional">google-noto-sans-lao-ui-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-lycian-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-lydian-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-malayalam-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-malayalam-ui-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-nko-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-old-south-arabian-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-old-turkic-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-osmanya-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-phoenician-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-shavian-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-symbols-fonts</packagereq>
       <packagereq type="optional">google-noto-sans-tamil-fonts</packagereq>
       <packagereq type="optional">google-noto-sans-tamil-ui-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-telugu-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-telugu-ui-fonts</packagereq>
       <packagereq type="optional">google-noto-sans-thai-fonts</packagereq>
       <packagereq type="optional">google-noto-sans-thai-ui-fonts</packagereq>
+     <packagereq type="optional">google-noto-sans-ugaritic-fonts</packagereq>
       <packagereq type="optional">google-noto-sans-ui-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-vai-fonts</packagereq>
       <packagereq type="optional">google-noto-serif-armenian-fonts</packagereq>
       <packagereq type="optional">google-noto-serif-fonts</packagereq>
       <packagereq type="optional">google-noto-serif-georgian-fonts</packagereq>
+      <packagereq type="optional">google-noto-serif-khmer-fonts</packagereq>
       <packagereq type="optional">google-noto-serif-lao-fonts</packagereq>
       <packagereq type="optional">google-noto-serif-thai-fonts</packagereq>
       <packagereq type="optional">grimmer-proggy-tinysz-fonts</packagereq>
diff --git a/comps-f20.xml.in b/comps-f20.xml.in
index 43e90978..4b12b877 100644
--- a/comps-f20.xml.in
+++ b/comps-f20.xml.in
@@ -2431,6 +2431,12 @@
       <packagereq type="default">gnu-free-mono-fonts</packagereq>
       <packagereq type="default">gnu-free-sans-fonts</packagereq>
       <packagereq type="default">gnu-free-serif-fonts</packagereq>
+      <packagereq type="default">google-noto-sans-lisu-fonts</packagereq>
+      <packagereq type="default">google-noto-sans-mandaic-fonts</packagereq>
+      <packagereq type="default">google-noto-sans-meeteimayek-fonts</packagereq>
+      <packagereq type="default">google-noto-sans-tagalog-fonts</packagereq>
+      <packagereq type="default">google-noto-sans-tai-tham-fonts</packagereq>
+      <packagereq type="default">google-noto-sans-tai-viet-fonts</packagereq>
       <packagereq type="default">jomolhari-fonts</packagereq>
       <packagereq type="default">khmeros-base-fonts</packagereq>
       <packagereq type="default">liberation-mono-fonts</packagereq>
@@ -2571,24 +2577,59 @@
       <packagereq type="optional">google-droid-sans-mono-fonts</packagereq>
       <packagereq type="optional">google-droid-serif-fonts</packagereq>
       <packagereq type="optional">google-noto-sans-armenian-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-avestan-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-bengali-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-bengali-ui-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-brahmi-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-carian-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-cherokee-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-coptic-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-deseret-fonts</packagereq>
       <packagereq type="optional">google-noto-sans-devanagari-fonts</packagereq>
       <packagereq type="optional">google-noto-sans-devanagari-ui-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-egyptian-hieroglyphs-fonts</packagereq>
       <packagereq type="optional">google-noto-sans-ethiopic-fonts</packagereq>
       <packagereq type="optional">google-noto-sans-fonts</packagereq>
       <packagereq type="optional">google-noto-sans-georgian-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-glagolitic-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-gujarati-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-gujarati-ui-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-hanunno-fonts</packagereq>
       <packagereq type="optional">google-noto-sans-hebrew-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-imperial-aramaic-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-kaithi-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-kannada-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-kannada-ui-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-kayah-li-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-kharoshthi-fonts</packagereq>
       <packagereq type="optional">google-noto-sans-khmer-fonts</packagereq>
       <packagereq type="optional">google-noto-sans-khmer-ui-fonts</packagereq>
       <packagereq type="optional">google-noto-sans-lao-fonts</packagereq>
       <packagereq type="optional">google-noto-sans-lao-ui-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-lycian-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-lydian-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-malayalam-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-malayalam-ui-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-nko-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-old-south-arabian-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-old-turkic-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-osmanya-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-phoenician-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-shavian-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-symbols-fonts</packagereq>
       <packagereq type="optional">google-noto-sans-tamil-fonts</packagereq>
       <packagereq type="optional">google-noto-sans-tamil-ui-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-telugu-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-telugu-ui-fonts</packagereq>
       <packagereq type="optional">google-noto-sans-thai-fonts</packagereq>
       <packagereq type="optional">google-noto-sans-thai-ui-fonts</packagereq>
+     <packagereq type="optional">google-noto-sans-ugaritic-fonts</packagereq>
       <packagereq type="optional">google-noto-sans-ui-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-vai-fonts</packagereq>
       <packagereq type="optional">google-noto-serif-armenian-fonts</packagereq>
       <packagereq type="optional">google-noto-serif-fonts</packagereq>
       <packagereq type="optional">google-noto-serif-georgian-fonts</packagereq>
+      <packagereq type="optional">google-noto-serif-khmer-fonts</packagereq>
       <packagereq type="optional">google-noto-serif-lao-fonts</packagereq>
       <packagereq type="optional">google-noto-serif-thai-fonts</packagereq>
       <packagereq type="optional">grimmer-proggy-tinysz-fonts</packagereq>
diff --git a/comps-f21.xml.in b/comps-f21.xml.in
index dc3c2cbf..1a49e90f 100644
--- a/comps-f21.xml.in
+++ b/comps-f21.xml.in
@@ -2431,6 +2431,12 @@
       <packagereq type="default">gnu-free-mono-fonts</packagereq>
       <packagereq type="default">gnu-free-sans-fonts</packagereq>
       <packagereq type="default">gnu-free-serif-fonts</packagereq>
+      <packagereq type="default">google-noto-sans-lisu-fonts</packagereq>
+      <packagereq type="default">google-noto-sans-mandaic-fonts</packagereq>
+      <packagereq type="default">google-noto-sans-meeteimayek-fonts</packagereq>
+      <packagereq type="default">google-noto-sans-tagalog-fonts</packagereq>
+      <packagereq type="default">google-noto-sans-tai-tham-fonts</packagereq>
+      <packagereq type="default">google-noto-sans-tai-viet-fonts</packagereq>
       <packagereq type="default">jomolhari-fonts</packagereq>
       <packagereq type="default">khmeros-base-fonts</packagereq>
       <packagereq type="default">liberation-mono-fonts</packagereq>
@@ -2571,24 +2577,59 @@
       <packagereq type="optional">google-droid-sans-mono-fonts</packagereq>
       <packagereq type="optional">google-droid-serif-fonts</packagereq>
       <packagereq type="optional">google-noto-sans-armenian-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-avestan-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-bengali-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-bengali-ui-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-brahmi-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-carian-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-cherokee-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-coptic-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-deseret-fonts</packagereq>
       <packagereq type="optional">google-noto-sans-devanagari-fonts</packagereq>
       <packagereq type="optional">google-noto-sans-devanagari-ui-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-egyptian-hieroglyphs-fonts</packagereq>
       <packagereq type="optional">google-noto-sans-ethiopic-fonts</packagereq>
       <packagereq type="optional">google-noto-sans-fonts</packagereq>
       <packagereq type="optional">google-noto-sans-georgian-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-glagolitic-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-gujarati-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-gujarati-ui-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-hanunno-fonts</packagereq>
       <packagereq type="optional">google-noto-sans-hebrew-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-imperial-aramaic-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-kaithi-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-kannada-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-kannada-ui-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-kayah-li-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-kharoshthi-fonts</packagereq>
       <packagereq type="optional">google-noto-sans-khmer-fonts</packagereq>
       <packagereq type="optional">google-noto-sans-khmer-ui-fonts</packagereq>
       <packagereq type="optional">google-noto-sans-lao-fonts</packagereq>
       <packagereq type="optional">google-noto-sans-lao-ui-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-lycian-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-lydian-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-malayalam-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-malayalam-ui-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-nko-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-old-south-arabian-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-old-turkic-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-osmanya-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-phoenician-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-shavian-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-symbols-fonts</packagereq>
       <packagereq type="optional">google-noto-sans-tamil-fonts</packagereq>
       <packagereq type="optional">google-noto-sans-tamil-ui-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-telugu-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-telugu-ui-fonts</packagereq>
       <packagereq type="optional">google-noto-sans-thai-fonts</packagereq>
       <packagereq type="optional">google-noto-sans-thai-ui-fonts</packagereq>
+     <packagereq type="optional">google-noto-sans-ugaritic-fonts</packagereq>
       <packagereq type="optional">google-noto-sans-ui-fonts</packagereq>
+      <packagereq type="optional">google-noto-sans-vai-fonts</packagereq>
       <packagereq type="optional">google-noto-serif-armenian-fonts</packagereq>
       <packagereq type="optional">google-noto-serif-fonts</packagereq>
       <packagereq type="optional">google-noto-serif-georgian-fonts</packagereq>
+      <packagereq type="optional">google-noto-serif-khmer-fonts</packagereq>
       <packagereq type="optional">google-noto-serif-lao-fonts</packagereq>
       <packagereq type="optional">google-noto-serif-thai-fonts</packagereq>
       <packagereq type="optional">grimmer-proggy-tinysz-fonts</packagereq>