diff --git a/65-0-thai-scalable-waree.conf b/65-0-thai-scalable-waree.conf
new file mode 100644
index 0000000..3a3d2a5
--- /dev/null
+++ b/65-0-thai-scalable-waree.conf
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+<match>
+  <test name="lang" compare="contains">
+    <string>th</string>
+  </test>
+  <test name="family">
+    <string>sans-serif</string>
+  </test>
+  <edit name="family" mode="prepend">
+    <string>Waree</string>
+  </edit>
+</match>
+
+<alias>
+  <family>Waree</family>
+  <default>
+    <family>sans-serif</family>
+  </default>
+</alias>
+
+<match>
+  <test name="lang" compare="contains">
+    <string>th</string>
+  </test>
+  <test name="family">
+    <string>serif</string>
+  </test>
+  <edit name="family" mode="prepend">
+    <string>Waree</string>
+  </edit>
+</match>
+
+<alias>
+  <family>Waree</family>
+  <default>
+    <family>serif</family>
+  </default>
+</alias>
+
+</fontconfig>
+
diff --git a/thai-scalable-fonts.spec b/thai-scalable-fonts.spec
index 46e15c4..e8751b0 100644
--- a/thai-scalable-fonts.spec
+++ b/thai-scalable-fonts.spec
@@ -1,5 +1,6 @@
 %global fontname thai-scalable
-%global fontconf 90-%{fontname}-synthetic
+%global fontconf1 90-%{fontname}-synthetic
+%global fontconf2 65-0-%{fontname}
 
 %global archivename fonts-tlwg
 
@@ -8,15 +9,16 @@
 
 Name:      %{fontname}-fonts
 Version:   0.6.5
-Release:   3%{?dist}
+Release:   4%{?dist}
 Summary:   Thai TrueType fonts
 License:   GPLv2+ and Bitstream Vera
 URL:       http://linux.thai.net/projects/thaifonts-scalable
 Source0:   http://linux.thai.net/pub/ThaiLinux/software/%{archivename}/%{archivename}-%{version}.tar.xz
-Source1:   %{fontconf}-garuda.conf
-Source2:   %{fontconf}-kinnari.conf
-Source3:   %{fontconf}-umpush.conf
-Source4:   %{fontconf}-laksaman.conf
+Source1:   %{fontconf1}-garuda.conf
+Source2:   %{fontconf1}-kinnari.conf
+Source3:   %{fontconf1}-umpush.conf
+Source4:   %{fontconf1}-laksaman.conf
+Source6:   %{fontconf2}-waree.conf
 
 #Appdata Metainfo
 Source11:  %{fontname}-garuda.metainfo.xml
@@ -66,7 +68,7 @@ Requires:       %{name}-common = %{version}-%{release}
 
 This package provides the Garuda family of Thai fonts.
 
-%_font_pkg -n garuda -f %{fontconf}-garuda.conf Garuda*.ttf
+%_font_pkg -n garuda -f %{fontconf1}-garuda.conf Garuda*.ttf
 %{_datadir}/appdata/%{fontname}-garuda.metainfo.xml
 
 
@@ -79,7 +81,7 @@ Requires:       %{name}-common = %{version}-%{release}
 
 This package provides the Kinnari family of Thai fonts.
 
-%_font_pkg -n kinnari -f %{fontconf}-kinnari.conf Kinnari*.ttf
+%_font_pkg -n kinnari -f %{fontconf1}-kinnari.conf Kinnari*.ttf
 %{_datadir}/appdata/%{fontname}-kinnari.metainfo.xml
 
 
@@ -196,7 +198,7 @@ Requires:       %{name}-common = %{version}-%{release}
 
 This package provides the Umpush family of Thai fonts.
 
-%_font_pkg -n umpush -f %{fontconf}-umpush.conf Umpush*.ttf
+%_font_pkg -n umpush -f %{fontconf1}-umpush.conf Umpush*.ttf
 %{_datadir}/appdata/%{fontname}-umpush.metainfo.xml
 
 %package -n %{fontname}-laksaman-fonts
@@ -208,7 +210,7 @@ Requires:       %{name}-common = %{version}-%{release}
 
 This package provides the Laksaman family of Thai fonts.
 
-%_font_pkg -n laksaman -f %{fontconf}-laksaman.conf Laksaman*.ttf
+%_font_pkg -n laksaman -f %{fontconf1}-laksaman.conf Laksaman*.ttf
 %{_datadir}/appdata/%{fontname}-laksaman.metainfo.xml
 
 %package -n %{fontname}-waree-fonts
@@ -220,7 +222,7 @@ Requires:       %{name}-common = %{version}-%{release}
 
 This package provides the Waree family of Thai fonts.
 
-%_font_pkg -n waree Waree*.ttf
+%_font_pkg -n waree -f %{fontconf2}-waree.conf Waree*.ttf
 %{_datadir}/appdata/%{fontname}-waree.metainfo.xml
 
 
@@ -247,18 +249,23 @@ rm %{buildroot}%{_datadir}/fontconfig/conf.avail/89-tlwg*-synthetic.conf
 
 # split up 90-ttf-thai-tlwg-synthetic.conf
 install -m 0644 -p %{SOURCE1} \
-        %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-garuda.conf
+        %{buildroot}%{_fontconfig_templatedir}/%{fontconf1}-garuda.conf
 install -m 0644 -p %{SOURCE2} \
-        %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-kinnari.conf
+        %{buildroot}%{_fontconfig_templatedir}/%{fontconf1}-kinnari.conf
 install -m 0644 -p %{SOURCE3} \
-        %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-umpush.conf
+        %{buildroot}%{_fontconfig_templatedir}/%{fontconf1}-umpush.conf
 install -m 0644 -p %{SOURCE4} \
-        %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-laksaman.conf
+        %{buildroot}%{_fontconfig_templatedir}/%{fontconf1}-laksaman.conf
 
-for fconf in %{fontconf}-garuda.conf \
-             %{fontconf}-kinnari.conf \
-             %{fontconf}-umpush.conf \
-	     %{fontconf}-laksaman.conf ; do
+# install 65-0-thai-scalable-waree.conf
+install -m 0644 -p %{SOURCE6} \
+        %{buildroot}%{_fontconfig_templatedir}/%{fontconf2}-waree.conf
+
+for fconf in %{fontconf1}-garuda.conf \
+             %{fontconf1}-kinnari.conf \
+             %{fontconf1}-umpush.conf \
+	     %{fontconf1}-laksaman.conf \
+	     %{fontconf2}-waree.conf; do
   ln -s %{_fontconfig_templatedir}/$fconf \
         %{buildroot}%{_fontconfig_confdir}/$fconf
 done
@@ -296,6 +303,10 @@ install -Dm 0644 -p %{SOURCE23} \
 
 
 %changelog
+* Mon Jul 15 2019 Peng Wu <pwu@redhat.com> - 0.6.5-4
+- Use Waree as default font for Thai language
+- Add 65-0-thai-scalable-waree.conf
+
 * Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.5-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild