diff --git a/logrotate-3.21.0-use-zstd-by-default.patch b/logrotate-3.21.0-use-zstd-by-default.patch
new file mode 100644
index 0000000000000000000000000000000000000000..018df0a94dcf4e93cdda2633d4637501d8174f47
--- /dev/null
+++ b/logrotate-3.21.0-use-zstd-by-default.patch
@@ -0,0 +1,105 @@
+--- logrotate-3.21.0/logrotate.8.orig	2023-05-15 13:36:47.706523283 +0800
++++ logrotate-3.21.0/logrotate.8	2023-05-15 13:40:31.694523283 +0800
+@@ -507,12 +507,12 @@
+ .TP
+ \fBcompresscmd\fR
+ Specifies which command to use to compress log files.  The default is
+-\fBgzip\fR(1).  See also \fBcompress\fR.
++\fBzstd\fR(1).  See also \fBcompress\fR.
+ 
+ .TP
+ \fBuncompresscmd\fR
+ Specifies which command to use to uncompress log files.  The default is
+-\fBgunzip\fR(1).
++\fBunzstd\fR(1).
+ 
+ .TP
+ \fBcompressext\fR
+@@ -523,7 +523,7 @@
+ .TP
+ \fBcompressoptions\fR
+ Command line options may be passed to the compression program, if one is
+-in use.  The default, for \fBgzip\fR(1), is "\-6" (biased towards high
++in use.  The default, for \fBzstd\fR(1), is "\-3" (biased towards high
+ compression at the expense of speed).
+ If you use a different compression command, you may need to change the
+ \fBcompressoptions\fR to match.
+@@ -769,8 +769,8 @@
+ .SH "SEE ALSO"
+ 
+ .BR chmod (2),
+-.BR gunzip (1),
+-.BR gzip (1),
++.BR unzstd (1),
++.BR zstd (1),
+ .BR mail (1),
+ .BR shred (1),
+ .BR strftime (3),
+--- logrotate-3.21.0/logrotate.8.in.orig	2023-05-15 13:40:47.055523283 +0800
++++ logrotate-3.21.0/logrotate.8.in	2023-05-15 13:41:28.460523283 +0800
+@@ -507,12 +507,12 @@
+ .TP
+ \fBcompresscmd\fR
+ Specifies which command to use to compress log files.  The default is
+-\fBgzip\fR(1).  See also \fBcompress\fR.
++\fBzstd\fR(1).  See also \fBcompress\fR.
+ 
+ .TP
+ \fBuncompresscmd\fR
+ Specifies which command to use to uncompress log files.  The default is
+-\fBgunzip\fR(1).
++\fBunzstd\fR(1).
+ 
+ .TP
+ \fBcompressext\fR
+@@ -523,7 +523,7 @@
+ .TP
+ \fBcompressoptions\fR
+ Command line options may be passed to the compression program, if one is
+-in use.  The default, for \fBgzip\fR(1), is "\-6" (biased towards high
++in use.  The default, for \fBzstd\fR(1), is "\-3" (biased towards high
+ compression at the expense of speed).
+ If you use a different compression command, you may need to change the
+ \fBcompressoptions\fR to match.
+@@ -769,8 +769,8 @@
+ .SH "SEE ALSO"
+ 
+ .BR chmod (2),
+-.BR gunzip (1),
+-.BR gzip (1),
++.BR unzstd (1),
++.BR zstd (1),
+ .BR mail (1),
+ .BR shred (1),
+ .BR strftime (3),
+--- logrotate-3.21.0/test/test-0108.sh.orig	2023-05-15 14:06:11.509410174 +0800
++++ logrotate-3.21.0/test/test-0108.sh	2023-05-15 14:08:40.203410174 +0800
+@@ -17,8 +17,8 @@
+ 
+ $RLR test-config.108 --force || exit 23
+ 
+-atime=$($STAT_ATIME_FORMAT test.log.1.gz)
+-mtime=$($STAT_MTIME_FORMAT test.log.1.gz)
++atime=$($STAT_ATIME_FORMAT test.log.1.zst)
++mtime=$($STAT_MTIME_FORMAT test.log.1.zst)
+ expected_time=946684800
+ 
+ if [ "$atime" -ne $expected_time ]; then
+@@ -34,5 +34,5 @@
+ # check last, to not modify atime
+ checkoutput <<EOF
+ test.log 0
+-test.log.1.gz 1 zero
++test.log.1.zst 1 zero
+ EOF
+--- logrotate-3.21.0/test/test-common.sh.orig	2023-05-15 14:14:26.692410174 +0800
++++ logrotate-3.21.0/test/test-common.sh	2023-05-15 14:14:40.318410174 +0800
+@@ -178,7 +178,7 @@
+ 	fi
+ 
+ 	if [ -n "$co_compressed" ] && [ "$co_compressed" != 0 ]; then
+-		contents=`gunzip -c $file`
++		contents=`unzstd -c $file`
+ 	else
+ 		contents=`cat $file | tr -d '\000'`
+ 	fi
diff --git a/logrotate.spec b/logrotate.spec
index ed2cf551254a766af0012497424f599020dc0517..7ef465305616a06cd6421e76b129add53373ea6a 100644
--- a/logrotate.spec
+++ b/logrotate.spec
@@ -1,4 +1,8 @@
-%define anolis_release 1
+%define anolis_release 2
+
+# Conditioned build zstd compression by default
+%bcond_without zstd_default
+
 Name:           logrotate
 Version:        3.21.0
 Release:        %{anolis_release}%{?dist}
@@ -7,7 +11,7 @@ Summary:        Rotates, compresses, removes and mails system log files
 License:        GPLv2+
 URL:            https://github.com/logrotate/logrotate
 Source0:        https://github.com/logrotate/logrotate/releases/download/%{version}/logrotate-%{version}.tar.xz
-
+Patch0:         logrotate-3.21.0-use-zstd-by-default.patch
 BuildRequires:  acl automake gcc libacl-devel libselinux-devel make popt-devel systemd-rpm-macros 
 Requires:       coreutils
 Requires(post): systemd
@@ -32,15 +36,22 @@ BuildArch:      noarch
 The %{name}-doc package contains documentation files for %{name}.
 
 %prep
-%autosetup
+%setup -qn %{name}-%{version}
+%if %{with zstd_default}
+%patch0 -p1
+%endif
 
 %build
-%configure --with-state-file-path=%{_localstatedir}/lib/logrotate/logrotate.status
-%make_build -s check
-
+%configure --with-state-file-path=%{_localstatedir}/lib/logrotate/logrotate.status \
+%if %{with zstd_default}
+        --with-compress-command=%{_bindir}/zstd \
+        --with-uncompress-command=%{_bindir}/unzstd \
+        --with-compress-extension=.zst \
+%endif
+%nil
+%make_build
 
 %install
-rm -rf $RPM_BUILD_ROOT
 %make_install
 
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d
@@ -51,6 +62,11 @@ install -p -m 644 examples/logrotate.conf $RPM_BUILD_ROOT%{_sysconfdir}/
 install -p -m 644 examples/{b,w}tmp $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/
 install -p -m 644 examples/logrotate.{service,timer} $RPM_BUILD_ROOT%{_unitdir}/
 
+%generate_compatibility_deps
+
+%check
+%make_build -s check
+
 %pre
 if [ ! -d %{_localstatedir}/lib/logrotate/ -a -f %{_localstatedir}/lib/logrotate.status ]; then
   mkdir -p %{_localstatedir}/lib/logrotate
@@ -70,7 +86,9 @@ fi
 
 %files
 %license COPYING
+%dir %{abidir}
 %{_sbindir}/logrotate
+%{abidir}/logrotate-option.list
 %{_unitdir}/logrotate.{service,timer}
 %{_mandir}/man8/logrotate.8*
 %{_mandir}/man5/logrotate.conf.5*
@@ -81,9 +99,12 @@ fi
 %ghost %verify(not size md5 mtime) %attr(0644, root, root) %{_localstatedir}/lib/logrotate/logrotate.status
 
 %files doc
-%doc ChangeLog.md INSTALL
+%doc ChangeLog.md
 
 %changelog
+* Mon May 15 2023 Funda Wang <fundawang@yeah.net> - 3.21.0-2
+- Use zstd compression by default
+
 * Wed Dec 14 2022 Heng Qi <hengqi@linux.alibaba.com> - 3.21.0-1
 - update to 3.21.0