diff --git a/comps-f12.xml.in b/comps-f12.xml.in
index bd9ca362..854d9700 100644
--- a/comps-f12.xml.in
+++ b/comps-f12.xml.in
@@ -1652,6 +1652,7 @@
       <packagereq type="default">dejavu-sans-fonts</packagereq>
       <packagereq type="default">dejavu-sans-mono-fonts</packagereq>
       <packagereq type="default">dejavu-serif-fonts</packagereq>
+      <packagereq type="default">ipa-pgothic-fonts</packagereq>
       <packagereq type="default">jomolhari-fonts</packagereq>
       <packagereq type="default">kacst-fonts</packagereq>
       <packagereq type="default">khmeros-base-fonts</packagereq>
@@ -1674,7 +1675,6 @@
       <packagereq type="default">stix-fonts</packagereq>
       <packagereq type="default">thai-scalable-waree-fonts</packagereq>
       <packagereq type="default">un-core-fonts-dotum</packagereq>
-      <packagereq type="default">vlgothic-fonts</packagereq>
       <packagereq type="optional">allgeyer-musiqwik-fonts</packagereq>
       <packagereq type="optional">allgeyer-musisync-fonts</packagereq>
       <packagereq type="optional">apanov-edrip-fonts</packagereq>
@@ -1747,7 +1747,6 @@
       <packagereq type="optional">icelandic-fonts</packagereq>
       <packagereq type="optional">ipa-gothic-fonts</packagereq>
       <packagereq type="optional">ipa-mincho-fonts</packagereq>
-      <packagereq type="optional">ipa-pgothic-fonts</packagereq>
       <packagereq type="optional">ipa-pmincho-fonts</packagereq>
       <packagereq type="optional">khmeros-battambang-fonts</packagereq>
       <packagereq type="optional">khmeros-bokor-fonts</packagereq>
@@ -1858,6 +1857,7 @@
       <packagereq type="optional">un-extra-fonts-taza</packagereq>
       <packagereq type="optional">un-extra-fonts-vada</packagereq>
       <packagereq type="optional">un-extra-fonts-yetgul</packagereq>
+      <packagereq type="optional">vlgothic-fonts</packagereq>
       <packagereq type="optional">vlgothic-p-fonts</packagereq>
       <packagereq type="optional">vollkorn-fonts</packagereq>
       <packagereq type="optional">woodardworks-laconic-fonts</packagereq>
@@ -3148,6 +3148,10 @@
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-ja_JP</packagereq>
       <packagereq type="conditional" requires="tkgate">tkgate-ja</packagereq>
       <packagereq type="conditional" requires="uim">uim-anthy</packagereq>
+      <packagereq type="default">ipa-gothic-fonts</packagereq>
+      <packagereq type="default">ipa-mincho-fonts</packagereq>
+      <packagereq type="default">ipa-pgothic-fonts</packagereq>
+      <packagereq type="default">ipa-pmincho-fonts</packagereq>
       <packagereq type="default">japanese-bitmap-fonts</packagereq>
       <packagereq type="default">sazanami-gothic-fonts</packagereq>
       <packagereq type="default">sazanami-mincho-fonts</packagereq>
@@ -3159,10 +3163,6 @@
       <packagereq type="optional">eblook</packagereq>
       <packagereq type="optional">ebview</packagereq>
       <packagereq type="optional">hanazono-fonts</packagereq>
-      <packagereq type="optional">ipa-gothic-fonts</packagereq>
-      <packagereq type="optional">ipa-mincho-fonts</packagereq>
-      <packagereq type="optional">ipa-pgothic-fonts</packagereq>
-      <packagereq type="optional">ipa-pmincho-fonts</packagereq>
       <packagereq type="optional">jfbterm</packagereq>
       <packagereq type="optional">jisksp16-1990-fonts</packagereq>
       <packagereq type="optional">kcc</packagereq>