diff --git a/baselibs.conf b/baselibs.conf
index bd575f5..cbc5e62 100644
--- a/baselibs.conf
+++ b/baselibs.conf
@@ -6,6 +6,7 @@ libisc1606
 	provides "bind-libs-<targettype> = <version>"
 libisccc1600
 libisccfg1600
+libns1604
 bind-devel
 	requires -bind-<targettype>
 	requires "libbind9-1600-<targettype> = <version>"
diff --git a/bind.changes b/bind.changes
index 8d5c328..9bf18e5 100644
--- a/bind.changes
+++ b/bind.changes
@@ -1,3 +1,29 @@
+-------------------------------------------------------------------
+Fri Sep 18 13:20:34 UTC 2020 - Josef Möllers <josef.moellers@suse.com>
+
+- Removed "-r /dev/urandom" from all invocations of rndc-confgen
+  (init/named system/lwresd.init system/named.init in vendor-files)
+  as this option is deprecated and causes rndc-confgen to fail.
+  [bsc#1173311, bsc#1176674, bsc#1170713, vendor-files.tar.bz2]
+
+-------------------------------------------------------------------
+Tue Sep 15 13:54:05 UTC 2020 - Josef Möllers <josef.moellers@suse.com>
+
+- /usr/bin/genDDNSkey: Removing the use of the -r option in the call
+  of /usr/sbin/dnssec-keygen as BIND now uses the random number
+  functions provided by the crypto library (i.e., OpenSSL or a
+  PKCS#11 provider) as a source of randomness rather than /dev/random.
+  Therefore the -r command line option no longer has any effect on
+  dnssec-keygen. Leaving the option in genDDNSkey as to not break
+  compatibility. Patch provided by Stefan Eisenwiener.
+  [bsc#1171313, vendor-files.tar.bz2]
+
+-------------------------------------------------------------------
+Fri Sep  4 14:40:27 UTC 2020 - Reinhard Max <max@suse.com>
+
+- Put libns into a separate subpackage to avoid file conflicts
+  in the libisc subpackage due to different sonums (bsc#1176092).
+
 -------------------------------------------------------------------
 Fri Aug 28 09:38:11 UTC 2020 - Dominique Leuenberger <dimstar@opensuse.org>
 
diff --git a/bind.spec b/bind.spec
index 728f944..233c583 100644
--- a/bind.spec
+++ b/bind.spec
@@ -31,6 +31,7 @@
 %define isccfg_sonum 1600
 %define libisccfg libisccfg%{isccfg_sonum}
 %define libns_sonum 1604
+%define libns libns%{libns_sonum}
 
 %define	VENDOR SUSE
 %if 0%{?suse_version} >= 1500
@@ -190,6 +191,14 @@ balanced binary (AVL) trees, bit masks comparison, event based
 programs, heap-based priority queues, memory handling, and program
 logging.
 
+%package -n %{libns}
+Summary:        NS shared library used by BIND
+Group:          System/Libraries
+
+%description -n %{libns}
+This library contains miscellaneous utility function used by the BIND
+server and utilities.
+
 %package -n %{libisccc}
 Summary:        Command Channel Library used by BIND
 Group:          System/Libraries
@@ -225,6 +234,7 @@ Requires:       %{libirs} = %{version}
 Requires:       %{libisccc} = %{version}
 Requires:       %{libisccfg} = %{version}
 Requires:       %{libisc} = %{version}
+Requires:       %{libns} = %{version}
 Provides:       bind8-devel
 Provides:       bind9-devel
 Obsoletes:      bind8-devel < %{version}
@@ -478,6 +488,8 @@ fi
 %postun -n %{libirs} -p /sbin/ldconfig
 %post   -n %{libisc} -p /sbin/ldconfig
 %postun -n %{libisc} -p /sbin/ldconfig
+%post   -n %{libns} -p /sbin/ldconfig
+%postun -n %{libns} -p /sbin/ldconfig
 %post   -n %{libisccc} -p /sbin/ldconfig
 %postun -n %{libisccc} -p /sbin/ldconfig
 %post   -n %{libisccfg} -p /sbin/ldconfig
@@ -550,6 +562,8 @@ fi
 
 %files -n %{libisc}
 %{_libdir}/libisc.so.%{isc_sonum}*
+
+%files -n %{libns}
 %{_libdir}/libns.so.%{libns_sonum}*
 
 %files -n %{libisccc}
diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2
index 3e4b40b..8548804 100644
--- a/vendor-files.tar.bz2
+++ b/vendor-files.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:14baf97f6f757418b09842a67b7b931cb8f965486adb0d338dfee48266065dc6
-size 23464
+oid sha256:24cd8f4e3c9728acf63216640c079a19bb133f0d0574b2705da9e9e27d92b4c3
+size 23595