diff --git a/65-2-adobe-source-han-serif-tw-fonts.conf b/65-2-adobe-source-han-serif-tw-fonts.conf
new file mode 100644
index 0000000..efcccae
--- /dev/null
+++ b/65-2-adobe-source-han-serif-tw-fonts.conf
@@ -0,0 +1,35 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "urn:fontconfig:fonts.dtd">
+<fontconfig>
+    <match>
+        <test name="lang">
+            <string>zh-tw</string>
+        </test>
+        <test name="family">
+            <string>serif</string>
+        </test>
+        <edit name="family" mode="prepend">
+            <string>Source Han Serif TW</string>
+            <string>Source Han Serif 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 Serif TW</string>
+            <string>Source Han Serif CN</string>
+        </edit>
+    </match>
+
+    <alias>
+        <family>Source Han Serif TW</family>
+        <default>
+            <family>serif</family>
+        </default>
+    </alias>
+</fontconfig>
diff --git a/adobe-source-han-serif-tw-fonts-fontconfig.conf b/adobe-source-han-serif-tw-fonts-fontconfig.conf
deleted file mode 100644
index 10f29ff..0000000
--- a/adobe-source-han-serif-tw-fonts-fontconfig.conf
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<fontconfig>
-    <match>
-        <test name="lang">
-            <string>zh-tw</string>
-        </test>
-        <test name="family">
-            <string>serif</string>
-        </test>
-        <edit name="family" mode="prepend">
-            <string>Source Han Serif TW</string>
-            <string>Source Han Serif 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 Serif TW</string>
-            <string>Source Han Serif CN</string>
-        </edit>
-    </match>
-
-    <alias>
-        <family>Source Han Serif TW</family>
-        <default>
-            <family>serif</family>
-        </default>
-    </alias>
-</fontconfig>
diff --git a/adobe-source-han-serif-tw-fonts.spec b/adobe-source-han-serif-tw-fonts.spec
index 3e8f17b..bddab01 100644
--- a/adobe-source-han-serif-tw-fonts.spec
+++ b/adobe-source-han-serif-tw-fonts.spec
@@ -1,51 +1,45 @@
-%global fontname adobe-source-han-serif-tw
-%global fontconf 65-2-%{fontname}.conf
+# SPDX-License-Identifier: MIT
 
-%global archivename SourceHanSerifTW
+Version: 2.001
+Release: 4%{?dist}
+URL:     https://github.com/adobe-fonts/source-han-serif/
 
-Name:           adobe-source-han-serif-tw-fonts
-Version:        2.001
-Release:        3%{?dist}
-Summary:        Adobe OpenType Pan-CJK font family for Traditional Chinese
+%global foundry           Adobe
+%global fontlicense       OFL-1.1
+%global fontlicenses      LICENSE.txt
 
-License:        OFL
-URL:            https://github.com/adobe-fonts/source-han-serif/
-Source0:        https://github.com/adobe-fonts/source-han-serif/raw/release/SubsetOTF/%{archivename}.zip
-Source1:        %{name}-fontconfig.conf
+%global fontfamily        Source Han Serif TW
+%global fontsummary       Adobe OpenType Pan-CJK font family for Traditional Chinese
+%global fonts             SourceHanSerifTW*.otf
+%global fontconfs         %{SOURCE10}
+%global fontdescription   %{expand:
+Source Han Serif is a set of OpenType/CFF Pan-CJK fonts.
+}
 
-BuildArch:      noarch
-BuildRequires:  fontpackages-devel
-Requires:       fontpackages-filesystem
+Source0:  https://github.com/adobe-fonts/source-han-serif/raw/release/SubsetOTF/SourceHanSerifTW.zip
+Source10: 65-2-%{fontpkgname}.conf
 
-%description
-Source Han Serif is a set of OpenType/CFF Pan-CJK fonts.
+%fontpkg
 
 %prep
 %autosetup -c
 
-
 %build
-
+%fontbuild
 
 %install
+%fontinstall
 
-install -m 0755 -d %{buildroot}%{_fontdir}
-install -m 0644 -p *.otf %{buildroot}%{_fontdir}
-
-install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \
-                   %{buildroot}%{_fontconfig_confdir}
-
-install -m 0644 -p %{SOURCE1} \
-        %{buildroot}%{_fontconfig_templatedir}/%{fontconf}
-ln -s %{_fontconfig_templatedir}/%{fontconf} \
-      %{buildroot}%{_fontconfig_confdir}/%{fontconf}
-
-
-%_font_pkg -f %{fontconf} *.otf
-%license LICENSE.txt
+%check
+%fontcheck
 
+%fontfiles
 
 %changelog
+* Wed Feb 15 2023 Peng Wu <pwu@redhat.com> - 2.001-4
+- Update to follow New Fonts Packaging Guidelines
+- Migrate to SPDX license
+
 * Wed Jan 18 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.001-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild