diff --git a/.gitignore b/.gitignore
index 690b03c..ff42981 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-/fetchmail-6.4.17.tar.xz
-/fetchmail-6.4.17.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 1411c1e..9a3054d 100644
--- a/fetchmail.spec
+++ b/fetchmail.spec
@@ -1,6 +1,6 @@
 Summary: A remote mail retrieval and forwarding utility
 Name: fetchmail
-Version: 6.4.17
+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 Mar 11 2021 Vitezslav Crhonek <vcrhonek@redhat.com> - 6.4.17-1
 - Update to fetchmail-6.4.17
 
diff --git a/sources b/sources
index d341252..39e398d 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (fetchmail-6.4.17.tar.xz) = 9d9adbf96a8023a3fc05ab0b6056730ed1db4b8cbaeb1d9a6c24c1f5a6129702e229e2bebed01186e2dc6d897d1d72a960ba9992acb6671d45f3dd6ce0892494
-SHA512 (fetchmail-6.4.17.tar.xz.asc) = 61c6b483f7ad5bd664c6b09ce448d06a31d2838d553f28dbd798582b1e0bee3a8e0b06383cf15d8e8d05fc352fddd13d076167cce7858b7b4441b1fb77671b0b
+SHA512 (fetchmail-6.4.18.tar.xz) = b42c23c184af68ac41e222cdb19536bf03de3da6a4357e065d203444e32c1c46a7f8d825421332ef61116cf0ef608211da0ad93ebe65d1ec45bce7289ee9e234
+SHA512 (fetchmail-6.4.18.tar.xz.asc) = ff1d6e9ed0e03809110ed81e6f1ac9f562ca082ad23a9dbee652d87006772b230ade41505ca640e94e305a67245fcf7aa0ca820b2925418b873831cd1210e892