diff --git a/comps-f21.xml.in b/comps-f21.xml.in
index d05652a0..3cf92c80 100644
--- a/comps-f21.xml.in
+++ b/comps-f21.xml.in
@@ -2646,6 +2646,8 @@
     <uservisible>false</uservisible>
     <packagelist>
       <packagereq type="default">abattis-cantarell-fonts</packagereq>
+      <packagereq type="default">adobe-source-han-sans-cn-fonts</packagereq>
+      <packagereq type="default">adobe-source-han-sans-twhk-fonts</packagereq>
       <packagereq type="default">dejavu-sans-fonts</packagereq>
       <packagereq type="default">dejavu-sans-mono-fonts</packagereq>
       <packagereq type="default">dejavu-serif-fonts</packagereq>
@@ -2685,7 +2687,6 @@
       <packagereq type="default">tabish-eeyek-fonts</packagereq>
       <packagereq type="default">thai-scalable-waree-fonts</packagereq>
       <packagereq type="default">vlgothic-fonts</packagereq>
-      <packagereq type="default">wqy-microhei-fonts</packagereq>
       <packagereq type="optional">aajohan-comfortaa-fonts</packagereq>
       <packagereq type="optional">adf-accanthis-2-fonts</packagereq>
       <packagereq type="optional">adf-accanthis-3-fonts</packagereq>
@@ -3069,6 +3070,7 @@
       <packagereq type="optional">wine-symbol-fonts</packagereq>
       <packagereq type="optional">woodardworks-laconic-fonts</packagereq>
       <packagereq type="optional">woodardworks-laconic-shadow-fonts</packagereq>
+      <packagereq type="optional">wqy-microhei-fonts</packagereq>
       <packagereq type="optional">wqy-zenhei-fonts</packagereq>
       <packagereq type="optional">xorg-x11-fonts-ethiopic</packagereq>
       <packagereq type="optional">yanone-kaffeesatz-fonts</packagereq>
@@ -5505,7 +5507,7 @@
     <langonly>zh_CN</langonly>
     <packagelist>
       <packagereq type="conditional" requires="xorg-x11-server-Xorg">ibus-libpinyin</packagereq>
-      <packagereq type="default">wqy-microhei-fonts</packagereq>
+      <packagereq type="default">adobe-source-han-sans-cn-fonts</packagereq>
       <packagereq type="optional">fcitx</packagereq>
       <packagereq type="optional">ibus-table-chinese-erbi</packagereq>
       <packagereq type="optional">ibus-table-chinese-wubi-haifeng</packagereq>
@@ -5519,6 +5521,7 @@
       <packagereq type="optional">scim-tables-chinese-extra</packagereq>
       <packagereq type="optional">stardict-dic-zh_CN</packagereq>
       <packagereq type="optional">wqy-bitmap-fonts</packagereq>
+      <packagereq type="optional">wqy-microhei-fonts</packagereq>
       <packagereq type="optional">wqy-unibit-fonts</packagereq>
       <packagereq type="optional">wqy-zenhei-fonts</packagereq>
     </packagelist>
@@ -6126,8 +6129,9 @@
     <langonly>zh_TW</langonly>
     <packagelist>
       <packagereq type="conditional" requires="xorg-x11-server-Xorg">ibus-chewing</packagereq>
-      <packagereq type="default">cjkuni-uming-fonts</packagereq>
-      <packagereq type="default">cjkuni-ukai-fonts</packagereq>
+      <packagereq type="default">adobe-source-han-sans-twhk-fonts</packagereq>
+      <packagereq type="optional">cjkuni-uming-fonts</packagereq>
+      <packagereq type="optional">cjkuni-ukai-fonts</packagereq>
       <packagereq type="optional">gcin</packagereq>
       <packagereq type="optional">ibus-table-chinese-array</packagereq>
       <packagereq type="optional">ibus-table-chinese-cangjie</packagereq>
diff --git a/comps-f22.xml.in b/comps-f22.xml.in
index 5d276bbc..fd90e7d7 100644
--- a/comps-f22.xml.in
+++ b/comps-f22.xml.in
@@ -2766,6 +2766,8 @@
     <uservisible>false</uservisible>
     <packagelist>
       <packagereq type="default">abattis-cantarell-fonts</packagereq>
+      <packagereq type="default">adobe-source-han-sans-cn-fonts</packagereq>
+      <packagereq type="default">adobe-source-han-sans-twhk-fonts</packagereq>
       <packagereq type="default">dejavu-sans-fonts</packagereq>
       <packagereq type="default">dejavu-sans-mono-fonts</packagereq>
       <packagereq type="default">dejavu-serif-fonts</packagereq>
@@ -2805,7 +2807,6 @@
       <packagereq type="default">tabish-eeyek-fonts</packagereq>
       <packagereq type="default">thai-scalable-waree-fonts</packagereq>
       <packagereq type="default">vlgothic-fonts</packagereq>
-      <packagereq type="default">wqy-microhei-fonts</packagereq>
       <packagereq type="optional">aajohan-comfortaa-fonts</packagereq>
       <packagereq type="optional">adf-accanthis-2-fonts</packagereq>
       <packagereq type="optional">adf-accanthis-3-fonts</packagereq>
@@ -3189,6 +3190,7 @@
       <packagereq type="optional">wine-symbol-fonts</packagereq>
       <packagereq type="optional">woodardworks-laconic-fonts</packagereq>
       <packagereq type="optional">woodardworks-laconic-shadow-fonts</packagereq>
+      <packagereq type="optional">wqy-microhei-fonts</packagereq>
       <packagereq type="optional">wqy-zenhei-fonts</packagereq>
       <packagereq type="optional">xorg-x11-fonts-ethiopic</packagereq>
       <packagereq type="optional">yanone-kaffeesatz-fonts</packagereq>
@@ -5625,7 +5627,7 @@
     <langonly>zh_CN</langonly>
     <packagelist>
       <packagereq type="conditional" requires="xorg-x11-server-Xorg">ibus-libpinyin</packagereq>
-      <packagereq type="default">wqy-microhei-fonts</packagereq>
+      <packagereq type="default">adobe-source-han-sans-cn-fonts</packagereq>
       <packagereq type="optional">fcitx</packagereq>
       <packagereq type="optional">ibus-table-chinese-erbi</packagereq>
       <packagereq type="optional">ibus-table-chinese-wubi-haifeng</packagereq>
@@ -5639,6 +5641,7 @@
       <packagereq type="optional">scim-tables-chinese-extra</packagereq>
       <packagereq type="optional">stardict-dic-zh_CN</packagereq>
       <packagereq type="optional">wqy-bitmap-fonts</packagereq>
+      <packagereq type="optional">wqy-microhei-fonts</packagereq>
       <packagereq type="optional">wqy-unibit-fonts</packagereq>
       <packagereq type="optional">wqy-zenhei-fonts</packagereq>
     </packagelist>
@@ -6246,8 +6249,9 @@
     <langonly>zh_TW</langonly>
     <packagelist>
       <packagereq type="conditional" requires="xorg-x11-server-Xorg">ibus-chewing</packagereq>
-      <packagereq type="default">cjkuni-uming-fonts</packagereq>
-      <packagereq type="default">cjkuni-ukai-fonts</packagereq>
+      <packagereq type="default">adobe-source-han-sans-twhk-fonts</packagereq>
+      <packagereq type="optional">cjkuni-uming-fonts</packagereq>
+      <packagereq type="optional">cjkuni-ukai-fonts</packagereq>
       <packagereq type="optional">gcin</packagereq>
       <packagereq type="optional">ibus-table-chinese-array</packagereq>
       <packagereq type="optional">ibus-table-chinese-cangjie</packagereq>