diff --git a/fetchmail-6.4.16.tar.xz b/fetchmail-6.4.16.tar.xz
deleted file mode 100644
index 32b78ba..0000000
--- a/fetchmail-6.4.16.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:044b9a0ac03afbae7744979defe3e2e32e39141bca68fd0c8deda2ed40884fb9
-size 1316660
diff --git a/fetchmail-6.4.16.tar.xz.asc b/fetchmail-6.4.16.tar.xz.asc
deleted file mode 100644
index c5d336f..0000000
--- a/fetchmail-6.4.16.tar.xz.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEE3EplW9mTzUhx+oIQ5BKxVu/zhVoFAmAhgEgACgkQ5BKxVu/z
-hVrU0hAAo0vIFt4LTCCTZDduLkpTwL2XYk//xmAnh0Rp6mKFYZXcLs976LOzo3C4
-f3ZTvosnM5K0rqiThVwGZMAppUTfAqKVSUWwEOfWbQQ5b+2CyokbeKhHCoxz6cNP
-ibR3uEZpzvecZcwhaO0RQlMpEMDDPRt52McGJ/HLB3CdGS6SqhUt+8pmLDs3iiIZ
-S5dY7NZ/Y/7512f9GmfJpq7DY3DOtPfSb6e2yF68v2ZpykCCkdvrq8aWcYqQ0bAX
-LjJL2SYjlK/27tPJlprZtgyIXvmihfFnTnRo3c03Cq8gXyOExNcYvFJicJKVsfWb
-itK3BpmfpkJx3wOAGmM7FP+1nmYZxAMEsopi3/cfy+zW2Fyv8IQ/M5AH2sCqXJiz
-UBxIilZ19l/jQcS617fMRnKGER3SbQgkGEK+61CFrKufjCBUjxKfAIpK6MVqQ4Uz
-lAGr5JtFra2c1IR5GL0RWVlP59JVgseW2nKEzGW26AifuxaJsbRGfE/GxVK4yZX8
-+u6+eUNgi9JpZFSoYsVJEIoUbjy00rsr7GFvhjm5OmoNclEhYWoEAVvSJ5zQjvic
-42v1R4NGgkNgJg9jRv1ejobfKBljKmqSKPbwZBG2qoKDxJGEEcZFHM1Ykyc5YB1G
-RA4AxeBuF3INrHv0d9m0FnM7lce6N3b8od2fTtF7lIZG9TE6FbQ=
-=Zw0k
------END PGP SIGNATURE-----
diff --git a/fetchmail-6.4.18.tar.xz b/fetchmail-6.4.18.tar.xz
new file mode 100644
index 0000000..da315e5
--- /dev/null
+++ b/fetchmail-6.4.18.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:302dc9bcdc6927dedf375d2baaead2347557faa70d98b1da83f2409fa6fb259f
+size 1317488
diff --git a/fetchmail-6.4.18.tar.xz.asc b/fetchmail-6.4.18.tar.xz.asc
new file mode 100644
index 0000000..8f3bb55
--- /dev/null
+++ b/fetchmail-6.4.18.tar.xz.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEE3EplW9mTzUhx+oIQ5BKxVu/zhVoFAmBfs8oACgkQ5BKxVu/z
+hVpOVg//QSBEHWICzODqTjoXRbM0SodkWMPMCnQuYG4FlYebgOjd5XNWtBxO6G46
+YmQculL3jWaPc5QUBQGEF1p3MhLS/GUv82EgRLXb0fDkjdzJY29ZvRtrOyPbN4/z
+exPjrxZn+U1aLZlJI0FGSz3vkDlNNs1EHe01BQU3+XtPRoNzKpOSAMDyLqFexD7U
+/z854cVhZ/jf4e4fYVoRCCpG8bIqwyhqAOwW+45ZUcqV0VO8TRs0vsAIpMnw2aAm
+GDrOgw/39qtQnL6ctSj9/3clumpI2qyCeaOXZcnmpdncx7viWcjL7y9uruiEMgLn
+Xm71mec2NA60k8d6CESL52hI7Qm5t2j2XPVH3lqgppJGz/uIWIMZsU0c1AzH1DYe
+eeEZRRNnjMBAx+hR/ItWYvIrrmt8FBhQmq6i+0c/MdZ7QhdX7nc1VLdUFYXqmJOM
+4vbh1IONfvPPkH1T3zTQNDePEqw8f+rG/xuTMLEAJ7WJjgG7kqoxmyRB0CPaQvqd
+ZpL7ZcxpTnr16/mj2JSKrpyxzkKzpYxL+OYQd7e8N8eKOEafoQsFtz2TetbJoRGI
+i4O6Zbs5ig6X4xmNdFkkLPKGXtmC5Gz5PKYz/zfE9H0uUEpvJiXKt5GOuOkYxJxm
+aGLJNgGrMp77S6knmjqJFKjnSu7dkLZKXP22HjJ0epkaf8l8TQ4=
+=EJH4
+-----END PGP SIGNATURE-----
diff --git a/fetchmail.changes b/fetchmail.changes
index bd83c1b..a07a2ed 100644
--- a/fetchmail.changes
+++ b/fetchmail.changes
@@ -1,3 +1,25 @@
+-------------------------------------------------------------------
+Tue Apr  6 02:13:46 UTC 2021 - Dirk Müller <dmueller@suse.com>
+
+- update to 6.4.18:
+  * fetchmailconf: fetchmail 6.4.16 added --sslcertfile to the configuration dump,
+    but fetchmailconf support was incomplete in Git 7349f124 and it could not
+    parse sslcertfile, thus the user settings editor came up empty with console
+    errors printed.  Fix configuration parser in fetchmailconf.
+  * fetchmailconf: do not require fetchmail for -V. do not require Tk (Tkinter)
+    for -d option. This is to fail more gracefully on incomplete installs.
+  * TLS code: remove OPENSSL_NO_DEPRECATED macros to avoid portability issues
+    with OpenSSL v3 - these are for development purposes, not production.
+  * TLS futureproofing: use SSL_use_PrivateKey_file instead of 
+    SSL_use_RSAPrivateKey_file, the latter will be deprecated with OpenSSL v3,
+    and the user's key file might be something else than RSA.
+  * IMAP client: it used to leak memory for username and password when trying
+    the LOGIN (password-based) authentication and encountered a timeout situation.
+  * dist-tools/getstats.py: also counts lines in *.py files, shown above.
+  * fetchmail.man: now mentions that you may need to add --ssl when specifying
+    a TLS-wrapped port.
+  * fetchmailconf: --version (-V) now prints the Python version in use.
+
 -------------------------------------------------------------------
 Mon Mar  1 07:51:03 UTC 2021 - Pedro Monreal <pmonreal@suse.com>
 
diff --git a/fetchmail.spec b/fetchmail.spec
index 04924ee..742c9aa 100644
--- a/fetchmail.spec
+++ b/fetchmail.spec
@@ -21,7 +21,7 @@
   %define _fillupdir %{_localstatedir}/adm/fillup-templates
 %endif
 Name:           fetchmail
-Version:        6.4.16
+Version:        6.4.18
 Release:        0
 Summary:        Full-Featured POP and IMAP Mail Retrieval Daemon
 License:        GPL-2.0-or-later