diff --git a/bind-9.16.16.tar.xz b/bind-9.16.16.tar.xz
deleted file mode 100644
index 653d587..0000000
--- a/bind-9.16.16.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6c913902adf878e7dc5e229cea94faefc9d40f44775a30213edd08860f761d7b
-size 5016864
diff --git a/bind-9.16.16.tar.xz.sha512.asc b/bind-9.16.16.tar.xz.sha512.asc
deleted file mode 100644
index 290cbea..0000000
--- a/bind-9.16.16.tar.xz.sha512.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEEJFV3TUL9/mucOD64/hACvFlwgR8FAmCdjfgACgkQ/hACvFlw
-gR/ndA//a75qqqJnMnLC1HJJ0IaZx9HF0gqevooe9WeRDMox9vJPxxNWFH+MLdAe
-TwhJBr65P1XwvUaXeqYZeT2EQKjmrVuJAuJJmM7hxy/TcrzLlU5bTNJNcHdpNhnK
-o+GFXHynirTPqaix1FNfIvvkKEqUDJxZzK4Lh7883gD7Xc5NTVPFEjQNHdz2MXp7
-p2eOG8BxrdOSo7jGss2Bpu4nYotFpW1UlovIugwlqpTWFnQzoR8cB68tk7/LQXDQ
-INc2n7lm1slFW6tewZDIU2HWSlgRusjaGidzHjQKt7OLM3Uq+P5wCJ4epD5WKHJQ
-Bs91u/N80pwTRdkCfSRz0zglIysNay9MmCzDELGsQv5eEDLSA7WGk0eZcxyyiYTp
-uayrjosyAWUu4HaJf+nL27DCotxuc8Znhr6whwMiA0G/PoX9mzEdDFhEXz9/yNYy
-a1Im7IonEqVMa448//+5HwuZScUV9Ju15zyMFm11H1xCjZn38xJyuHVNCni40Tb3
-ytHcKZReda33yemqYtCjejd5gfoDQfO2G12G3dZwtTlEgO7Y2bdhtQfPPCjEDkh+
-QIYsk3gxpxWtxhWnJO1FCQle8nADj9m8MVlJ6uX3bm6eOJuyr42ynOVoDKtYNEXc
-B920yPrEhP8AIa5rc97N0m1b0ZWRfg3EB1xrimQRfThxfS1YCDs=
-=UVqV
------END PGP SIGNATURE-----
diff --git a/bind-9.16.18.tar.xz b/bind-9.16.18.tar.xz
new file mode 100644
index 0000000..6594a0f
--- /dev/null
+++ b/bind-9.16.18.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3c6263a4364eb5dce233f9f22b90acfa1ec2488d534f91d21663d0ac25ce5e65
+size 5023512
diff --git a/bind-9.16.18.tar.xz.sha512.asc b/bind-9.16.18.tar.xz.sha512.asc
new file mode 100644
index 0000000..9767b87
--- /dev/null
+++ b/bind-9.16.18.tar.xz.sha512.asc
@@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNATURE-----
+Comment: GPGTools - https://gpgtools.org
+
+iQIzBAABCgAdFiEEqtu6UHTxQC97adVrxbTukxqfnf0FAmDMkCoACgkQxbTukxqf
+nf34bQ/9HZC8r+H+XFflVINL2MKmOvWYFlBimk437oTEsnFFB78bnsKhnud4p0av
+1Utz5NrFo0Ju3m6MRIe+dFgCSFKO1usf45WHsY3ROAXAcWpSkC24Qdw91Tc6jETE
+2YRBReIeHU0VC7ak5MxlFbKEfGtUHbpXSmmP89v6PA1ZD1uWi47IHhMs/d+eJXPQ
+DoPCQxiEZ4dzCRC0v0xzsbXlAXEUDTqLpMk6jcMTKQY5uwuKugOHzvuWLbJYtCZ/
+l9bqUnf1bvgMNFvqvC7Z76Nx4MdyaJVfpG65A8b/6i+7Ru4rPGjJck3sn4x3Lh6/
+U+b709bZpa3dyyw/nuONQNIG89MRKjjhkDesh8FadkvtBeo1HFRtGNic3RFVue0u
+vIX80leersVMTd2Yddq9vWNVNJS4kBpSzSN1fZxlZBMryvY5JPJXJi+yLxXyTxX/
+bMcyui8RIMvu9t3EVxUD6I6ob/bUC/lmGya9zmQ8DuRucRqCb9mPjNNTzdpVLw4l
+uv+1PmKtkfceHJikS8K/AMUYoKSdTyZbRAzGOro7Hv5GGVMH0iLrlyhI1BmzJN2i
+eBNIRvf9zRg/6/1sHj6omcDXcp0Smj8s5qhBbCEScSl7x1mWdNZy48m4IB5f8RFb
+dtKfsVvHqZ49/FB5XGV2mwGOwqxf/4EH/vlq2uZ+fK4Z74uH4+o=
+=mOJQ
+-----END PGP SIGNATURE-----
diff --git a/bind.changes b/bind.changes
index c9e9aca..a3c1a87 100644
--- a/bind.changes
+++ b/bind.changes
@@ -1,3 +1,36 @@
+-------------------------------------------------------------------
+Wed Jun 23 06:46:55 UTC 2021 - Josef Möllers <josef.moellers@suse.com>
+
+- Upgrade to 9.16.18
+  * The configuration-checking code failed to account for the
+    inheritance rules of the "key-directory" option.
+  * When preparing DNS responses, named could replace the letters
+    'W' (uppercase) and 'w' (lowercase) with '\000'.
+    This has been fixed.
+    [bind-9.16.18.tar.xz, bind-9.16.18.tar.xz.sha512.asc]
+
+-------------------------------------------------------------------
+Thu Jun 17 09:01:18 UTC 2021 - Josef Möllers <josef.moellers@suse.com>
+
+- Upgrade to 9.16.17
+  Major changes (bug fixes):
+  * A copy-and-paste error caused the IP_DONTFRAG socket option to
+    be enabled instead of disabled. This has been fixed.
+  * The calculation of the estimated IXFR transaction size in
+    dns_journal_iter_init() was invalid.
+  * Fix a race condition in reading and writing key files for zones
+    using KASP and configured in multiple views.
+  * Zones which are configured in multiple views with different
+    values set for "dnssec-policy" and with identical values set
+    for "key-directory" are now detected and treated as a
+    configuration error.
+  * Address a potential memory leak in dst_key_fromnamedfile().
+  * Check that the first and last SOA record of an AXFR are
+    consistent.
+  * Improvements related to network manager/task manager
+    integration
+  [bind-9.16.17.tar.xz, bind-9.16.17.tar.xz.sha512.asc]
+
 -------------------------------------------------------------------
 Fri May 21 07:23:04 UTC 2021 - Josef Möllers <josef.moellers@suse.com>
 
diff --git a/bind.spec b/bind.spec
index c28ca64..55e540f 100644
--- a/bind.spec
+++ b/bind.spec
@@ -45,7 +45,7 @@
   %define _fillupdir %{_localstatedir}/adm/fillup-templates
 %endif
 Name:           bind
-Version:        9.16.16
+Version:        9.16.18
 Release:        0
 Summary:        Domain Name System (DNS) Server (named)
 License:        MPL-2.0