diff --git a/adobe-source-han-sans-tw-fonts-fontconfig.conf b/adobe-source-han-sans-tw-fonts-fontconfig.conf
index c2a548d..5e96ffd 100644
--- a/adobe-source-han-sans-tw-fonts-fontconfig.conf
+++ b/adobe-source-han-sans-tw-fonts-fontconfig.conf
@@ -44,38 +44,6 @@
             <string>zh-tw</string>
         </test>
         <test name="family">
-            <string>serif</string>
-        </test>
-        <edit name="family" mode="prepend">
-            <string>Source Han Sans TW</string>
-            <string>Source Han Sans CN</string>
-        </edit>
-    </match>
-    <match>
-        <test name="lang">
-            <string>zh-hk</string>
-        </test>
-        <test name="family">
-            <string>serif</string>
-        </test>
-        <edit name="family" mode="prepend">
-            <string>Source Han Sans TW</string>
-            <string>Source Han Sans CN</string>
-        </edit>
-    </match>
-
-    <alias>
-        <family>Source Han Sans TW</family>
-        <default>
-            <family>serif</family>
-        </default>
-    </alias>
-
-    <match>
-        <test name="lang">
-            <string>zh-tw</string>
-        </test>
-        <test name="family">
             <string>sans-serif</string>
         </test>
         <edit name="family" mode="prepend">
diff --git a/adobe-source-han-sans-tw-fonts.spec b/adobe-source-han-sans-tw-fonts.spec
index b30c9b9..bcc654d 100644
--- a/adobe-source-han-sans-tw-fonts.spec
+++ b/adobe-source-han-sans-tw-fonts.spec
@@ -5,7 +5,7 @@
 
 Name:           adobe-source-han-sans-tw-fonts
 Version:        1.004
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Adobe OpenType Pan-CJK font family for Traditional Chinese
 
 License:        OFL
@@ -34,7 +34,7 @@ Japanese, and Korean.
 
 
 %prep
-%setup -q -n %{archivename}
+%autosetup -n %{archivename}
 
 
 %build
@@ -59,6 +59,10 @@ ln -s %{_fontconfig_templatedir}/%{fontconf} \
 
 
 %changelog
+* Tue Jun 20 2017 Peng Wu <pwu@redhat.com> - 1.004-5
+- Use Source Han Sans for Mono and Sans
+- Use Source Han Serif for Serif
+
 * Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.004-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild