diff --git a/.gitignore b/.gitignore
index 15f2007..ff42981 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-/fetchmail-6.4.16.tar.xz
-/fetchmail-6.4.16.tar.xz.asc
+/fetchmail-6.4.18.tar.xz
+/fetchmail-6.4.18.tar.xz.asc
diff --git a/fetchmail.spec b/fetchmail.spec
index d883f37..9afc5e8 100644
--- a/fetchmail.spec
+++ b/fetchmail.spec
@@ -1,6 +1,6 @@
 Summary: A remote mail retrieval and forwarding utility
 Name: fetchmail
-Version: 6.4.16
+Version: 6.4.18
 Release: 1%{?dist}
 Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.xz
 Source1: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.xz.asc
@@ -62,6 +62,9 @@ rm -f $RPM_BUILD_ROOT%{python3_sitelib}/__pycache__/fetchmailconf*
 %config(noreplace) %attr(0600, mail, mail) %{_sysconfdir}/fetchmailrc.example
 
 %changelog
+* Wed Mar 31 2021 Vitezslav Crhonek <vcrhonek@redhat.com> - 6.4.18-1
+- Update to fetchmail-6.4.18
+
 * Thu Feb 11 2021 Vitezslav Crhonek <vcrhonek@redhat.com> - 6.4.16-1
 - Update to fetchmail-6.4.16
 
diff --git a/sources b/sources
index c2640a9..39e398d 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (fetchmail-6.4.16.tar.xz) = 5e0d87739d73991c56111222cd84d6e16913b205c4d427feeb9b03d7f330442851f48769e168883ad75afc0a9db9b5267d1ad30e2ca0efe14263befd625dccf0
-SHA512 (fetchmail-6.4.16.tar.xz.asc) = c8509810e648e3128fa0f3005772449362ab5cd4273ef0441a2b4b976da1c28266a8320531fc3e11d8278dee4bdb48d645e767e9f248bed63096d317d12203b7
+SHA512 (fetchmail-6.4.18.tar.xz) = b42c23c184af68ac41e222cdb19536bf03de3da6a4357e065d203444e32c1c46a7f8d825421332ef61116cf0ef608211da0ad93ebe65d1ec45bce7289ee9e234
+SHA512 (fetchmail-6.4.18.tar.xz.asc) = ff1d6e9ed0e03809110ed81e6f1ac9f562ca082ad23a9dbee652d87006772b230ade41505ca640e94e305a67245fcf7aa0ca820b2925418b873831cd1210e892