diff --git a/AnolisServer.xml b/AnolisServer.xml
new file mode 100644
index 0000000000000000000000000000000000000000..d595c2513293783d84a8f425bec03e4c891a7d2b
--- /dev/null
+++ b/AnolisServer.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<zone>
+  <short>Public</short>
+  <description>For use in public areas. You do not trust the other computers on networks to not harm your computer. Only selected incoming connections are accepted.</description>
+  <service name="ssh"/>
+  <service name="dhcpv6-client"/>
+  <service name="cockpit"/>
+  <forward/>
+</zone>
\ No newline at end of file
diff --git a/firewalld-1.0.1.tar.gz b/firewalld-1.0.1.tar.gz
deleted file mode 100644
index c3e3e0ea62653543cba0ea2549bed9aa662c31ca..0000000000000000000000000000000000000000
Binary files a/firewalld-1.0.1.tar.gz and /dev/null differ
diff --git a/firewalld-1.2.1.tar.gz b/firewalld-1.2.1.tar.gz
new file mode 100644
index 0000000000000000000000000000000000000000..0dae9a14e2e088aeffad0b0eef466a3295800715
Binary files /dev/null and b/firewalld-1.2.1.tar.gz differ
diff --git a/firewalld.spec b/firewalld.spec
index 93e8ffd5b1198c2b88626d50ba9b49e7a7e75c41..37aa41e53bb04bd0e8b3507c1c29b45ab6f10585 100644
--- a/firewalld.spec
+++ b/firewalld.spec
@@ -1,13 +1,14 @@
 %define anolis_release 1
 
 Name: firewalld
-Version: 1.0.1
+Version: 1.2.1
 Release: %{anolis_release}%{?dist}
 Summary: A firewall daemon with D-Bus interface providing a dynamic firewall
 
 License: GPLv2+
 URL:     http://www.firewalld.org
 Source0: https://github.com/firewalld/firewalld/releases/download/v%{version}/firewalld-%{version}.tar.gz
+Source1: AnolisServer.xml
 
 BuildArch: noarch
 
@@ -31,7 +32,7 @@ Requires(post): systemd
 Requires(preun): systemd
 Requires(postun): systemd
 Requires: firewalld-filesystem = %{version}-%{release}
-Requires: python3-firewall  = %{version}-%{release}
+Requires: python3-firewall = %{version}-%{release}
 Obsoletes: firewalld-selinux < 0.4.4.2-2
 Conflicts: selinux-policy < 3.14.1-28
 Conflicts: cockpit-ws < 173-2
@@ -40,7 +41,10 @@ Recommends: libcap-ng-python3
 Provides: variant_config(Server)
 
 # Remove old config subpackages
+Obsoletes: firewalld-config-standard <= 0.3.15
+Obsoletes: firewalld-config-cloud <= 0.3.15
 Obsoletes: firewalld-config-server <= 0.3.15
+Obsoletes: firewalld-config-workstation <= 0.3.15
 
 %description
 firewalld is a firewall service daemon that provides a dynamic customizable 
@@ -102,6 +106,14 @@ Recommends: polkit
 The firewall configuration application provides an configuration interface for 
 firewalld.
 
+%package doc
+Summary: Documentation files for %{name}
+BuildArch: noarch
+Requires: %{name} = %{version}-%{release}
+
+%description doc
+The %{name}-doc package contains documentation files for %{name}.
+
 %prep
 %autosetup -p1
 
@@ -121,6 +133,7 @@ desktop-file-install --delete-original \
   %{buildroot}%{_datadir}/applications/firewall-config.desktop
 
 install -d -m 755 %{buildroot}%{_prefix}/lib/firewalld/zones/
+install -c -m 644 %{SOURCE1} %{buildroot}%{_prefix}/lib/firewalld/zones/AnolisServer.xml
 
 # standard firewalld.conf
 mv %{buildroot}%{_sysconfdir}/firewalld/firewalld.conf \
@@ -129,11 +142,16 @@ mv %{buildroot}%{_sysconfdir}/firewalld/firewalld.conf \
 # server firewalld.conf
 cp -a %{buildroot}%{_sysconfdir}/firewalld/firewalld-standard.conf \
     %{buildroot}%{_sysconfdir}/firewalld/firewalld-server.conf
+sed -i 's|^DefaultZone=.*|DefaultZone=AnolisServer|g' \
+    %{buildroot}%{_sysconfdir}/firewalld/firewalld-server.conf
 
 rm -f %{buildroot}%{_datadir}/polkit-1/actions/org.fedoraproject.FirewallD1.policy
 
 # remove file mistakenly added to upstream dist tarball
 rm -f %{buildroot}%{_datadir}/man/man1/firewallctl.1
+ 
+# conflicts with kodi-firewalld package, bug #2129946
+rm -f %{buildroot}%{_prefix}/lib/firewalld/services/kodi-*.xml
 
 %find_lang %{name} --all-name
 
@@ -159,9 +177,6 @@ if [ ! -e %{_sysconfdir}/firewalld/firewalld.conf ]; then
         server)
             ln -sf firewalld-server.conf %{_sysconfdir}/firewalld/firewalld.conf || :
             ;;
-        workstation | silverblue | kde | kinoite)
-            ln -sf firewalld-workstation.conf %{_sysconfdir}/firewalld/firewalld.conf || :
-            ;;
         *)
             ln -sf firewalld-standard.conf %{_sysconfdir}/firewalld/firewalld.conf
             ;;
@@ -169,14 +184,14 @@ if [ ! -e %{_sysconfdir}/firewalld/firewalld.conf ]; then
 fi
 
 if [ ! -e %{_datadir}/polkit-1/actions/org.fedoraproject.FirewallD1.policy ]; then
-    # For all other editions, we'll use the Server polkit policy
+    # For Server editions, we'll use the Server polkit policy
     ln -sf org.fedoraproject.FirewallD1.server.policy.choice %{_datadir}/polkit-1/actions/org.fedoraproject.FirewallD1.policy || :
     # no extra rules choice here (yet)
     rm -f %{_datadir}/polkit-1/rules.d/org.fedoraproject.FirewallD1.rules || :
 fi
 
 %files -f %{name}.lang
-%doc COPYING README
+%doc COPYING
 %{_sbindir}/firewalld
 %{_bindir}/firewall-cmd
 %{_bindir}/firewall-offline-cmd
@@ -186,7 +201,7 @@ fi
 %{_datadir}/zsh/site-functions/_firewalld
 %ghost %config(missingok,noreplace) %{_datadir}/polkit-1/rules.d/org.fedoraproject.FirewallD1.rules
 %{_prefix}/lib/firewalld/icmptypes/*.xml
-%{_prefix}/lib/firewalld/ipsets/README
+%{_prefix}/lib/firewalld/ipsets/README.md
 %{_prefix}/lib/firewalld/policies/*.xml
 %{_prefix}/lib/firewalld/services/*.xml
 %{_prefix}/lib/firewalld/zones/*.xml
@@ -215,6 +230,9 @@ fi
 %{_sysconfdir}/modprobe.d/firewalld-sysctls.conf
 %config(noreplace) %{_sysconfdir}/logrotate.d/firewalld
 
+%files doc
+%doc README.md CODE_OF_CONDUCT.md
+
 %files -n python3-firewall
 %attr(0755,root,root) %dir %{python3_sitelib}/firewall
 %attr(0755,root,root) %dir %{python3_sitelib}/firewall/__pycache__
@@ -249,7 +267,7 @@ fi
 
 %files -n firewalld-test
 %dir %{_datadir}/firewalld/testsuite
-%{_datadir}/firewalld/testsuite/README
+%{_datadir}/firewalld/testsuite/README.md
 %{_datadir}/firewalld/testsuite/testsuite
 %dir %{_datadir}/firewalld/testsuite/integration
 %{_datadir}/firewalld/testsuite/integration/testsuite
@@ -260,10 +278,10 @@ fi
 %{_datadir}/firewalld/testsuite/python/firewalld_test.py
 
 %files -n firewall-applet
+%attr(0755,root,root) %dir %{_sysconfdir}/firewall
 %{_bindir}/firewall-applet
 %defattr(0644,root,root)
 %config(noreplace) %{_sysconfdir}/xdg/autostart/firewall-applet.desktop
-%dir %{_sysconfdir}/firewall
 %config(noreplace) %{_sysconfdir}/firewall/applet.conf
 %{_datadir}/icons/hicolor/*/apps/firewall-applet*.*
 %{_mandir}/man1/firewall-applet*.1*
@@ -281,5 +299,8 @@ fi
 %{_mandir}/man1/firewall-config*.1*
 
 %changelog
+* Wed Oct 26 2022 Guyu Wang <guyvwang@163.com> - 1.2.1-1
+- update package to v1.2.1
+
 * Sat Mar 12 2022 Peng Zhou <zhoupeng@linux.alibaba.com> - 1.0.1-1
 - Init for Anolis OS 23