diff --git a/xmlstarlet.spec b/xmlstarlet.spec
index f1dc093..1c27552 100644
--- a/xmlstarlet.spec
+++ b/xmlstarlet.spec
@@ -2,7 +2,7 @@
 
 Name: xmlstarlet
 Version: 1.6.1
-Release: 17%{?dist}
+Release: 20%{?dist}
 Summary: Command Line XML Toolkit
 License: MIT
 URL: http://xmlstar.sourceforge.net/
@@ -12,7 +12,7 @@ Patch0: xmlstarlet-1.6.1-nogit.patch
 # http://sourceforge.net/tracker/?func=detail&aid=3266898&group_id=66612&atid=515106
 
 BuildRequires: make
-BuildRequires:  gcc
+BuildRequires: gcc
 BuildRequires: xmlto automake autoconf libxslt-devel
 BuildRequires: libxml2-devel >= 2.6.23
 BuildRequires: docbook5-schemas
@@ -26,21 +26,19 @@ plain text files using UNIX grep, sed, awk, diff, patch, join, etc
 commands.
 
 %prep
-%setup -q
-%patch0 -p1 -b .nogit
+%autosetup -p1
 
 
 %build
 autoreconf -i
 %configure --disable-static-libs --with-libxml-include-prefix=%{_includedir}/libxml2 --docdir=%{_pkgdocdir} # --libdir=%{_libdir}
-make %{?_smp_mflags}
+%make_build
 
 
 %install
-rm -fr %{buildroot}
-make install DESTDIR=$RPM_BUILD_ROOT
+%make_install
 # Avoid name kludging in autotools
-mv $RPM_BUILD_ROOT%{_bindir}/xml $RPM_BUILD_ROOT%{_bindir}/xmlstarlet
+mv %{buildroot}%{_bindir}/xml %{buildroot}%{_bindir}/xmlstarlet
 
 
 %check
@@ -56,8 +54,18 @@ make check
 
 
 %changelog
-* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1.6.1-17
-- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+* Thu May 12 2022 Vitezslav Crhonek <vcrhonek@redhat.com> - 1.6.1-20
+- Rebuild
+  Related: #2069689
+
+* Thu Mar 17 2022 Neal Gompa <ngompa@datto.com> - 1.6.1-19
+- Minor spec improvements
+
+* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.1-18
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.1-17
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
 
 * Thu Jan 28 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.1-16
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild