diff --git a/comps-f13.xml.in b/comps-f13.xml.in
index c17d8fb6..c92dbcc2 100644
--- a/comps-f13.xml.in
+++ b/comps-f13.xml.in
@@ -660,8 +660,9 @@
     <uservisible>true</uservisible>
     <langonly>zh</langonly>
     <packagelist>
-      <packagereq type="mandatory">cjkuni-ukai-fonts</packagereq>
-      <packagereq type="mandatory">cjkuni-uming-fonts</packagereq>
+      <packagereq type="mandatory">wqy-zenhei-fonts</packagereq>
+      <packagereq type="default">cjkuni-ukai-fonts</packagereq>
+      <packagereq type="default">cjkuni-uming-fonts</packagereq>
       <packagereq type="conditional" requires="autocorr-en">autocorr-zh</packagereq>
       <packagereq type="conditional" requires="eclipse-platform">eclipse-nls-zh</packagereq>
       <packagereq type="conditional" requires="eclipse-platform">eclipse-nls-zh_TW</packagereq>
@@ -704,7 +705,6 @@
       <packagereq type="optional">taipeifonts</packagereq>
       <packagereq type="optional">wqy-bitmap-fonts</packagereq>
       <packagereq type="optional">wqy-unibit-fonts</packagereq>
-      <packagereq type="optional">wqy-zenhei-fonts</packagereq>
     </packagelist>
   </group>
   <group>
@@ -1815,7 +1815,6 @@
     <uservisible>true</uservisible>
     <packagelist>
       <packagereq type="default">abyssinica-fonts</packagereq>
-      <packagereq type="default">cjkuni-uming-fonts</packagereq>
       <packagereq type="default">dejavu-sans-fonts</packagereq>
       <packagereq type="default">dejavu-sans-mono-fonts</packagereq>
       <packagereq type="default">dejavu-serif-fonts</packagereq>
@@ -1859,6 +1858,7 @@
       <packagereq type="default">thai-scalable-waree-fonts</packagereq>
       <packagereq type="default">un-core-dotum-fonts</packagereq>
       <packagereq type="default">vlgothic-fonts</packagereq>
+      <packagereq type="default">wqy-zenhei-fonts</packagereq>
       <packagereq type="optional">adf-accanthis-2-fonts</packagereq>
       <packagereq type="optional">adf-accanthis-3-fonts</packagereq>
       <packagereq type="optional">adf-accanthis-fonts</packagereq>
@@ -1902,6 +1902,7 @@
       <packagereq type="optional">chisholm-letterslaughing-fonts</packagereq>
       <packagereq type="optional">chisholm-to-be-continued-fonts</packagereq>
       <packagereq type="optional">cjkuni-ukai-fonts</packagereq>
+      <packagereq type="optional">cjkuni-uming-fonts</packagereq>
       <packagereq type="optional">conakry-fonts</packagereq>
       <packagereq type="optional">ctan-cm-lgc-roman-fonts</packagereq>
       <packagereq type="optional">ctan-cm-lgc-sans-fonts</packagereq>
@@ -2090,7 +2091,6 @@
       <packagereq type="optional">vollkorn-fonts</packagereq>
       <packagereq type="optional">woodardworks-laconic-fonts</packagereq>
       <packagereq type="optional">woodardworks-laconic-shadow-fonts</packagereq>
-      <packagereq type="optional">wqy-zenhei-fonts</packagereq>
       <packagereq type="optional">xorg-x11-fonts-ethiopic</packagereq>
       <packagereq type="optional">yanone-kaffeesatz-fonts</packagereq>
       <packagereq type="optional">yanone-tagesschrift-fonts</packagereq>