diff --git a/gawk-5.3.0.tar.xz b/gawk-5.3.1.tar.xz
similarity index 32%
rename from gawk-5.3.0.tar.xz
rename to gawk-5.3.1.tar.xz
index 9c4cfd71949c2d042fc4e355ccf53bbedeb8fbdc..1500925a8857e673ac48efac1abf12644e3fc5c5 100644
Binary files a/gawk-5.3.0.tar.xz and b/gawk-5.3.1.tar.xz differ
diff --git a/gawk.spec b/gawk.spec
index 3a129a4d71e170486ccb7308d400590f5491d908..7add5cde6e46355d7a8553c696784bcb308ae649 100644
--- a/gawk.spec
+++ b/gawk.spec
@@ -7,16 +7,13 @@
                           grep -i -e "gawk_api_minor.*[[:digit:]]" | \
                           grep -o -e "[[:digit:]]" || :)
 Name:		gawk
-Version:	5.3.0
+Version:	5.3.1
 Release:	1
 License:	GPL-3.0-or-later AND GPL-2.0-or-later AND LGPL-2.1-or-later AND BSD-3-Clause
 Summary:	The GNU version of the AWK text processing utility
 URL:		https://www.gnu.org/software/gawk/
 Source0:	https://ftp.gnu.org/gnu/gawk/gawk-%{version}.tar.xz
 
-#Patch1:         Disable-racy-test-in-test-iolint.awk.patch
-#Patch2:         Restore-removed-test-in-test-iolint.awk.patch
-#Patch3:         Reorder-statements-in-iolint-to-try-to-eliminate-a-r.patch
 Patch1:         Disable-pma-test.awk.patch
 
 BuildRequires:	gcc automake grep make gcc
@@ -27,6 +24,7 @@ Requires:	filesystem >= 3
 Provides:	/bin/awk
 Provides:	/bin/gawk
 Provides:	gawk(abi) = %{gawk_api_major}.%{gawk_api_minor}
+Obsoletes:      %{name}-lang < 5.3.1
 
 %description
 The gawk package is the GNU implementation of awk.
@@ -41,19 +39,7 @@ Requires:         %{name}%{?_isa} = %{version}-%{release}
 This subpackage provides /usr/include/gawkapi.h header file, which contains
 definitions for use by extension functions calling into gawk.
 
-%package help
-Summary:          Documentation for gawk utility
-Requires:         %{name} = %{version}-%{release}
-Requires:         man,info
-BuildArch:        noarch
-%description help
-This subpackage provide addtional documents and manuals for gawk.
-
-%package lang
-Summary:        Language files and locale
-Requires:       %{name} = %{version}-%{release}
-%description lang
-This subpackage provides with language releated files and locales for gawk.
+%package_help
 
 %prep
 %autosetup -n %{name}-%{version} -p1
@@ -68,7 +54,7 @@ makeinfo --html -I doc -o html/gawk     doc/gawk.texi
 makeinfo --html -I doc -o html/gawkinet doc/gawkinet.texi
 
 %check
-make check
+%make_build check
 
 %install
 %make_install
@@ -77,7 +63,7 @@ rm -f ${RPM_BUILD_ROOT}%{_bindir}/gawk-%{version}*
 rm -f ${RPM_BUILD_ROOT}%{_infodir}/dir
 
 ln -sf gawk ${RPM_BUILD_ROOT}%{_bindir}/awk
-ln -sf gawk.1.gz ${RPM_BUILD_ROOT}%{_mandir}/man1/awk.1.gz
+ln -sf gawk.1 ${RPM_BUILD_ROOT}%{_mandir}/man1/awk.1
 ln -sf /usr/share/awk   ${RPM_BUILD_ROOT}%{_datadir}/gawk
 ln -sf /usr/libexec/awk ${RPM_BUILD_ROOT}%{_libexecdir}/gawk
 
@@ -88,7 +74,9 @@ install -m 0644 -p html/gawkinet/*       ${RPM_BUILD_ROOT}%{_docdir}/%{name}/htm
 install -m 0644 -p doc/gawk.{pdf,ps}     ${RPM_BUILD_ROOT}%{_docdir}/%{name}
 install -m 0644 -p doc/gawkinet.{pdf,ps} ${RPM_BUILD_ROOT}%{_docdir}/%{name}
 
-%files
+%find_lang %{name}
+
+%files -f %{name}.lang
 %doc NEWS README POSIX.STD
 %license COPYING
 %{_bindir}/*awk
@@ -106,14 +94,14 @@ install -m 0644 -p doc/gawkinet.{pdf,ps} ${RPM_BUILD_ROOT}%{_docdir}/%{name}
 %doc %{_docdir}/%{name}/gawk.{pdf,ps}
 %doc %{_docdir}/%{name}/gawkinet.{pdf,ps}
 %doc %{_docdir}/%{name}/html
-%{_mandir}/man{1/*,3/*}
-%{_infodir}/*awk*.info*
-%{_infodir}/gawk_*
-
-%files lang
-%{_datadir}/locale/*
+%{_mandir}/man?/*
+%{_infodir}/*
 
 %changelog
+* Thu Sep 19 2024 Funda Wang <fundawang@yeah.net> - 5.3.1-1
+- update to 5.3.1
+- merge lang subpackage into main package
+
 * Wed Jul  3 2024 warlcok <hunan@kylinos.cn> - 5.3.0-1
 - update gawk to 5.3.0
 
diff --git a/gawk.yaml b/gawk.yaml
index 4ffc1bc7929e07f6be737f4cd366518ca139c65c..70c3563e947c383c635997a6ef28f1a330414540 100644
--- a/gawk.yaml
+++ b/gawk.yaml
@@ -1,4 +1,4 @@
 version_control: git
 src_repo: https://git.savannah.gnu.org/git/gawk.git
 tag_prefix: ^gawk-
-seperator: .
+separator: .