diff --git a/nsd-4.3.5.tar.gz b/nsd-4.3.5.tar.gz
deleted file mode 100644
index 0837ddb..0000000
--- a/nsd-4.3.5.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7da2b43e30b3d7f307722c608f719bfb169f0d985c764a34fa0669dc33484472
-size 1184220
diff --git a/nsd-4.3.5.tar.gz.asc b/nsd-4.3.5.tar.gz.asc
deleted file mode 100644
index 7904ea8..0000000
--- a/nsd-4.3.5.tar.gz.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCAAdFiEE7fqj8spObrBWga+On28cLX4EX40FAmAPzMYACgkQn28cLX4E
-X43uuBAAnKaozrPBLozKIz+pXqlJd13gtBt/YLUfMMG82LtW8U733YqKhiitsJzq
-JYUSySpOZMds7iEMd92BtMmnXlxRgwxliJY94swt4OJv7/jzv0YHYSlaIjk/7LNx
-rADtxrf5yHhQE2tIck7ZvVXGJ+vFNHF3Wyo9LtR1zKn5sDAlvqQ3wdi2hzc1xZ7L
-3K88S0IOKrLKej4KSRJjE029HjYCYcPeNQ2ELG+ZQtHbvKTRiMj2MWNLgQt5GaMr
-0dH7Q86ekOsJ/+mw9wxHZIB7nSPrUEQLbJQO/+7g5BAbHHsUR49mK+zKNxraVztu
-9KunEKdmoHrnvKrmS9AqH9y9/t7nrYA+TRCAwa9AffLOVDOcw4DaeW1J4y/QdMem
-Hbuoxwd6gNFyZWBttsTmO09JJnh3WTy+NWzFAL8jrZ94YbB+qCAiXuHklgQJ+DNg
-aralJsS13pcwVMJ3169zwcLddW9uDCyiyAgIWo8/9n2GoFE9+eqh+nmHSRB2iKGb
-wEMUIvUIboAd/9zBUJm8R6HEJnYfn4Mae9Cvv7IV2cDPij0hcl+4qM6HA0EmB0N7
-ylmdPdxg9UepBOWndsK7Tb/q5hoULveIiVogEDzC2ni58QdL8RSlE+iX00p19Amr
-lbD5kZbJO5j4oXskKKqaIBNyewfDqOEWiZb0hwFVQ3MXrDhNi50=
-=DyDu
------END PGP SIGNATURE-----
diff --git a/nsd-4.3.6.tar.gz b/nsd-4.3.6.tar.gz
new file mode 100644
index 0000000..3175d4c
--- /dev/null
+++ b/nsd-4.3.6.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:bee6c0cf5525acc41dade9ec9e29435299211b0de290059878f7e53249e75f18
+size 1197835
diff --git a/nsd-4.3.6.tar.gz.asc b/nsd-4.3.6.tar.gz.asc
new file mode 100644
index 0000000..89b6e59
--- /dev/null
+++ b/nsd-4.3.6.tar.gz.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCAAdFiEE7fqj8spObrBWga+On28cLX4EX40FAmBsRK0ACgkQn28cLX4E
+X42mHA//Wv40jjkNC5nKp056LJ3r5sfSko0wY+ncAaf3eA/MxA6RskjZHSZiw7m+
+jgocp7ZocsxLYAFIdgJK9PlPLFcxTB8KjcqoLIoPyUX6PQERS2IZ+Di8ylxSJxEB
+sYIhI9n7tU7bjqv87g1/KUqvIAwt0q+gja8qiwRtppwU33B0C2C96yLerjxHb+2C
+IJP0YFfoUJ4PFWv0dI7nUoXc6U9HM3tq9lKuA08aDbajhBUBjf4zDD11aLJJN/wW
+GFnLHonFO2slbcyrRX2ejYCdT7g5KQSbIzgtnbP4mWqGrGgYHbHgwckpC3y584zx
+5L2SfBuvE4JCnshyeH91x8493QEEqpB6/6BJjehQAZdCzDR+dtR1HgqeuY3cMRFQ
+FjZ5GwoYlneCPLfm7xfnLZO6oMf+qNIRNr6scldvaubEyu89xAfYWHDePy6iEiWQ
+dbKmk/f4fokoPWagT+RVbMQ+cVRc6TPkmG9iLRYjjesUi8NRt5t3LK587KIim+U8
+hC6dp+GtfeDS/B+Ltze0w9DqeXFOHo0wpOEP90uHsySrjhhxuR60Q6FvBWgWDCLR
+BRxthfMs4EtHTbozWvoNnp90jQ3iVJw62yES/kR8rEHkULZXXnwd6UAHoqgGRcrd
+QbkEYbdar8fth+wPOA+2j3x5Gh0F5sPeFVtO7zuddThiIFrgEbE=
+=jTIN
+-----END PGP SIGNATURE-----
diff --git a/nsd.changes b/nsd.changes
index c81aedf..bc47491 100644
--- a/nsd.changes
+++ b/nsd.changes
@@ -1,3 +1,40 @@
+-------------------------------------------------------------------
+Tue Apr  6 18:32:52 UTC 2021 - Michael Ströder <michael@stroeder.com>
+
+- New upstream release 4.3.6
+
+FEATURES:
+- Fix #146 with #147: DNSTAP log the local address of the server
+  with the dnstap logs.
+- Enable configuring a control-interface by interface name.
+- A -p option to nsd-checkzone to print a successfully read zone.
+- Add Extended DNS Errors RFC8914
+- Per zone Access Control List for queries
+  with an allow-query: option.
+
+BUG FIXES:
+- Prevent a few more yacc clashes.
+- Merge PR #153 from fobser: Repair -fno-common linker errors
+  automatically.
+- Fix uninitialized access of log_buf in error printout on apply ixfr.
+- Fix AF_LOCAL compile error for Solaris.
+- Fix ifaddrs compile error for Solaris.
+- Fix ifaddrs.h compile error for Solaris.
+- Man page documentation for dnstap options.
+- Fix segfault on high verbosity for TLS channels with dnstap log
+  local address.
+- Fix #163: A TSIG noncompliance with RFC 2845.
+- Fix that wildcard is printed as a star instead of escaped, in
+  logs and in written zone files.
+- Fix double config.h include in configlexer.c
+- Fix to remove configyyrename from makedist.sh and also
+  update the flex and bison rules there to add the "c_" prefix.
+- Fix configure to use header checks with compile.
+- Fix warning about unused function log_addr.
+- Fix #154: TXT with parentheses fails in 4.3.5.
+- Align parsing of TXT elements with how bind does it.
+- Fix configure failure for enable systemd because of autoconf.
+
 -------------------------------------------------------------------
 Tue Jan 26 19:08:44 UTC 2021 - Michael Ströder <michael@stroeder.com>
 
diff --git a/nsd.spec b/nsd.spec
index d135d64..1b01435 100644
--- a/nsd.spec
+++ b/nsd.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package nsd
 #
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -23,15 +23,15 @@
 %define zonesdir   %{configdir}/zones
 %define pidfile    %{_rundir}/nsd/nsd.pid
 Name:           nsd
-Version:        4.3.5
+Version:        4.3.6
 Release:        0
 #
 Summary:        An authoritative-only domain name server
 #
 License:        BSD-3-Clause
 Group:          Productivity/Networking/DNS/Servers
-URL:            http://open.nlnetlabs.nl/nsd/
-Source:         http://open.nlnetlabs.nl/downloads/nsd/nsd-%{version}.tar.gz
+URL:            https://open.nlnetlabs.nl/nsd/
+Source:         https://open.nlnetlabs.nl/downloads/nsd/nsd-%{version}.tar.gz
 Source1:        nsd.service
 Source2:        tmpfiles-nsd.conf
 # Generated with from https://nlnetlabs.nl/people/
@@ -41,7 +41,7 @@ Source2:        tmpfiles-nsd.conf
 #   sed 's,.*PGP Key ID: \([A-Z0-9 ]\+\).*,\1,' | \
 #   perl -e 'while($_=<>){chop; s, ,,g;print; print(" ");}' | \
 #   xargs gpg --export-options export-minimal --export > nsd.keyring
-# 
+#
 Source4:        nsd.keyring
 Source5:        https://www.nlnetlabs.nl/downloads/nsd/nsd-%{version}.tar.gz.asc
 Source10:       nsd-rpmlintrc