diff --git a/fetchmail-6.4.22.tar.xz b/fetchmail-6.4.22.tar.xz
deleted file mode 100644
index 34e8e962b07c55289bd9e15bdc39d402c4a8e26a..0000000000000000000000000000000000000000
Binary files a/fetchmail-6.4.22.tar.xz and /dev/null differ
diff --git a/fetchmail-6.4.22.tar.xz.asc b/fetchmail-6.4.22.tar.xz.asc
deleted file mode 100644
index 05cc2ae02f37748817f711961f3f2a5ec8f1671c..0000000000000000000000000000000000000000
--- a/fetchmail-6.4.22.tar.xz.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEE3EplW9mTzUhx+oIQ5BKxVu/zhVoFAmE/vEgACgkQ5BKxVu/z
-hVqlTA//bMqmPdUfYjm6VYSy3n2v+arXSp1t3G3rKuWGUXsxu6w8YmTNgd7y+3b8
-k5owzg60FOHYaG2icX+2DYfZlprWdsz8sI1fZRUH5xxe4ozAPg0iPbvSLiXqBNI8
-uxewWTOt1pCSYQptaWF32wqZvcHtnHU0nEEEy0u3n1UG9vEbDoh7Ej9Z0TpvwnhA
-54tU8vDV/sQdS+XN/DuWYfXp6cqrNg6P/eGUb877i+E2YoFsoqHrZV0A27IMTxOn
-qTi0upysu0QyMRQo1Xd6zwjs7MyPudZ9pMoeXGu+wnFW6g8dDsnTx/SBh27sgssh
-SwTnKYANztgDCGH2ySrLgX0QxseI8Y7JPNbfQDS3pkpPx5TQuO+aDQcQhXhzG94o
-oez7/aUmSvAIbPKiF8Y1SQMoRms5iSNVJL8LyQNLOSDZziKT+fGzDVJhnNh3Jcn9
-Pbj5oMYkcd8YKcjZYRXlwK4rbdcvA/79b3TuFMmcZ7eiTJHiy7i/C7R9qrYyxXao
-c6ZmRjNuAYpL0TnFhIy/yUe/+mhse87a4I2XTk1CE1Z1RpNI4xPDHO+7EtSyTZDV
-1rBs9tA2B7t/WcXVQxZDF4MqJ02TWZRwCgxRJGCMG7d28xvZaxpuZrZ9jlosQHt4
-jEgoWvcboCCK0WOZlnpgtKwvd8SRoPoDxLJmnKc35r1dqsP4Aso=
-=Qd4Q
------END PGP SIGNATURE-----
diff --git a/fetchmail-6.4.30.tar.xz b/fetchmail-6.4.30.tar.xz
new file mode 100644
index 0000000000000000000000000000000000000000..ffd82826e6d0c2276dc1a0b65e9366a2fd4e47a0
Binary files /dev/null and b/fetchmail-6.4.30.tar.xz differ
diff --git a/fetchmail-6.4.30.tar.xz.asc b/fetchmail-6.4.30.tar.xz.asc
new file mode 100644
index 0000000000000000000000000000000000000000..eec89f0376c962f1cf4b839172d8a896cc3ead78
--- /dev/null
+++ b/fetchmail-6.4.30.tar.xz.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEE3EplW9mTzUhx+oIQ5BKxVu/zhVoFAmJoRYwACgkQ5BKxVu/z
+hVodSQ/9Epl8qsZEVuMV+wwtAJrlhgySOJTbvAs5b85pBlFCO7Yy1UZqqO44skO4
+ZgdcFTFf8DwY29b7DK/7bjoz6gWitJlwBRoqoPpRbbyxzIcdCUTHb9w3hDxPJO9j
+qF6V/Sj6wXtJWzXXeJ485/QmkmW1gTIU6mBwfPJJetsgDbNE8maB5S9a6TGY8XeD
+jmOkuf/ayPymoeKUziQI0YwV3zDpXiwqCRd32jLd1Np9GpQxvVSm8BdUV1GGR70M
+I3/fgry+m/3J+O3Gx5cjrZDwCcqsxQwtIiFp8NkhPbxxsgJMweBNgQt5CvoZbI91
+4Ot/kKscrKVTLgMfdArENd5ccG8lZPqOLb4GzmZBhwmOn9HMXYoSVVsiL6qAPD6j
+M6PwbJ0b2BHjYquWkLoNzb3J5SQBgj59IdhhevM7S5uydlZuGT0K+YFTHsanWRwY
+GUjEpK73QtiRqnNt8Br1zesMr66Mwjgk/s9mfXAfa1Vccsln18YNV5K12wTTSBxO
+A5A1VejoaYGN1GxdtlIDQm2MU+p613A7/ExwYjww6KzYD41usgJ7IU546oc3O5mA
+um92XZg4tCqu4c1+oFirUFq8gLCMR+mHhUhe8Z1PSqsZtXVOWCYG+03usMcybe2U
+XNZVdR7MxKlpz+Xtmr9BNn+x3weOIRhRhRkEl3H3kTXP4PilQ6U=
+=ralo
+-----END PGP SIGNATURE-----
diff --git a/fetchmail.spec b/fetchmail.spec
index 6664f8d473ee2404cfcf9c2be20f9a21e95a479e..77c6e7acc71dfd81d9c90bee804ab0b3c10ddd9c 100644
--- a/fetchmail.spec
+++ b/fetchmail.spec
@@ -1,14 +1,19 @@
-Summary:             A remote mail retrieval and forwarding utility
-Name:                fetchmail
-Version:             6.4.22
-Release:             1
-URL:                 http://www.fetchmail.info/
-License:             GPL+ and Public Domain
-Source0:             https://sourceforge.net/projects/%{name}/files/branch_6.4/%{name}-%{version}.tar.xz
-Source1:             https://sourceforge.net/projects/%{name}/files/branch_6.4/%{name}-%{version}.tar.xz.asc
-Source2:             fetchmail.service
-Source3:             fetchmailrc.example
-BuildRequires:       gcc gettext-devel krb5-devel openssl-devel systemd python3-devel
+Summary: 	     A remote mail retrieval and forwarding utility
+Name: 		     fetchmail
+Version: 	     6.4.30
+Release: 	     1
+Source0: 	     http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.xz
+Source1: 	     http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.xz.asc
+# systemd service file
+Source2: 	     fetchmail.service
+# example configuration file
+Source3: 	     fetchmailrc.example
+URL: http://www.fetchmail.info/
+# For a breakdown of the licensing, see COPYING
+License: 	     GPLv2+ and Public Domain
+BuildRequires: 	     gcc gettext-devel krb5-devel openssl-devel systemd python3-devel
+BuildRequires: 	     make
+
 %description
 Fetchmail is a remote mail retrieval and forwarding utility intended
 for use over on-demand TCP/IP links, like SLIP or PPP connections.
@@ -16,6 +21,7 @@ Fetchmail supports every remote-mail protocol currently in use on the
 Internet (POP2, POP3, RPOP, APOP, KPOP, all IMAPs, ESMTP ETRN, IPv6,
 and IPSEC) for retrieval. Then Fetchmail forwards the mail through
 SMTP so you can read it through your favorite mail client.
+
 Install fetchmail if you need to retrieve mail over SLIP or PPP
 connections.
 
@@ -31,14 +37,21 @@ make
 
 %install
 make install DESTDIR=$RPM_BUILD_ROOT
+
+# install example systemd unit
 mkdir -p $RPM_BUILD_ROOT%{_unitdir}
 install -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_unitdir}/fetchmail.service
+
+# install example config file
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}
 install -p -m 600 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/fetchmailrc.example
+
+# remove fetchmailconf stuff
 rm -f $RPM_BUILD_ROOT%{_bindir}/fetchmailconf*
 rm -f $RPM_BUILD_ROOT%{_mandir}/man1/fetchmailconf.1*
 rm -f $RPM_BUILD_ROOT%{python3_sitelib}/fetchmailconf.py*
 rm -f $RPM_BUILD_ROOT%{python3_sitelib}/__pycache__/fetchmailconf*
+
 %find_lang %name
 
 %files -f %{name}.lang
@@ -49,6 +62,9 @@ rm -f $RPM_BUILD_ROOT%{python3_sitelib}/__pycache__/fetchmailconf*
 %config(noreplace) %attr(0600, mail, mail) %{_sysconfdir}/fetchmailrc.example
 
 %changelog
+* Thu Jun 23 2022 tanyulong <tanyulong@kylinos.cn> - 6.4.30-1
+- Update upstream version to 6.4.30
+
 * Tue Sep 14 2021 yaoxin <yaoxin30@huawei.com> - 6.4.22-1
 - Update to 6.4.22 for fix CVE-2021-39272