diff --git a/bind-9.11-oot-manual.patch b/bind-9.11-oot-manual.patch
index 84e9d25..fe1788f 100644
--- a/bind-9.11-oot-manual.patch
+++ b/bind-9.11-oot-manual.patch
@@ -1,4 +1,4 @@
-From 8ca95f47231822df2b9c171a4da1e93ca5b748eb Mon Sep 17 00:00:00 2001
+From c5b39725cd4f3f30eac7eeafd7802005a1fad533 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Petr=20Men=C5=A1=C3=ADk?= <pemensik@redhat.com>
 Date: Wed, 25 Jul 2018 12:24:16 +0200
 Subject: [PATCH] Use make automatic variables to install updated manuals
@@ -12,17 +12,17 @@ Install all files in single command instead of iterating on each of them.
  bin/delv/Makefile.in    |  6 ++++--
  bin/dig/Makefile.in     |  8 ++++----
  bin/dnssec/Makefile.in  |  6 ++++--
- bin/named/Makefile.in   | 13 +++++++++----
+ bin/named/Makefile.in   | 12 +++++++++---
  bin/pkcs11/Makefile.in  |  9 ++++-----
  bin/python/Makefile.in  |  8 ++++----
  bin/tools/Makefile.in   | 25 +++++++++++++++----------
- 9 files changed, 54 insertions(+), 38 deletions(-)
+ 9 files changed, 54 insertions(+), 37 deletions(-)
 
 diff --git a/bin/check/Makefile.in b/bin/check/Makefile.in
-index c124e80..1174f8d 100644
+index 8f009a4..de3c066 100644
 --- a/bin/check/Makefile.in
 +++ b/bin/check/Makefile.in
-@@ -83,12 +83,14 @@ installdirs:
+@@ -84,12 +84,14 @@ installdirs:
  	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${sbindir}
  	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${mandir}/man8
  
@@ -41,10 +41,10 @@ index c124e80..1174f8d 100644
  uninstall::
  	rm -f ${DESTDIR}${mandir}/man8/named-compilezone.8
 diff --git a/bin/confgen/Makefile.in b/bin/confgen/Makefile.in
-index 87f13dd..7865c0c 100644
+index 0588f8b..44d87fd 100644
 --- a/bin/confgen/Makefile.in
 +++ b/bin/confgen/Makefile.in
-@@ -95,13 +95,14 @@ installdirs:
+@@ -93,13 +93,14 @@ installdirs:
  	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${sbindir}
  	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${mandir}/man8
  
@@ -64,7 +64,7 @@ index 87f13dd..7865c0c 100644
  uninstall::
  	rm -f ${DESTDIR}${mandir}/man8/tsig-keygen.8
 diff --git a/bin/delv/Makefile.in b/bin/delv/Makefile.in
-index e2d2802..19361a8 100644
+index ea106f8..77adc91 100644
 --- a/bin/delv/Makefile.in
 +++ b/bin/delv/Makefile.in
 @@ -63,10 +63,12 @@ installdirs:
@@ -83,10 +83,10 @@ index e2d2802..19361a8 100644
  uninstall::
  	rm -f ${DESTDIR}${mandir}/man1/delv.1
 diff --git a/bin/dig/Makefile.in b/bin/dig/Makefile.in
-index a9830a9..d7ac0b6 100644
+index 8ea146f..3a97024 100644
 --- a/bin/dig/Makefile.in
 +++ b/bin/dig/Makefile.in
-@@ -91,16 +91,16 @@ installdirs:
+@@ -93,16 +93,16 @@ installdirs:
  	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${bindir}
  	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${mandir}/man1
  
@@ -108,10 +108,10 @@ index a9830a9..d7ac0b6 100644
  uninstall::
  	for m in ${MANPAGES}; do \
 diff --git a/bin/dnssec/Makefile.in b/bin/dnssec/Makefile.in
-index 2239ad1..ce0a177 100644
+index dfaad27..be1ac3b 100644
 --- a/bin/dnssec/Makefile.in
 +++ b/bin/dnssec/Makefile.in
-@@ -110,9 +110,11 @@ installdirs:
+@@ -114,9 +114,11 @@ installdirs:
  	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${sbindir}
  	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${mandir}/man8
  
@@ -126,36 +126,34 @@ index 2239ad1..ce0a177 100644
  uninstall::
  	for m in ${MANPAGES}; do rm -f ${DESTDIR}${mandir}/man8/$$m || exit 1; done
 diff --git a/bin/named/Makefile.in b/bin/named/Makefile.in
-index e1f85a9..d92bc9a 100644
+index 0485002..10d568f 100644
 --- a/bin/named/Makefile.in
 +++ b/bin/named/Makefile.in
-@@ -176,12 +176,17 @@ installdirs:
+@@ -169,10 +169,16 @@ installdirs:
  	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${mandir}/man5
  	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${mandir}/man8
  
--install:: named@EXEEXT@ lwresd@EXEEXT@ installdirs
+-install:: named@EXEEXT@ installdirs
 +install-man5: named.conf.5
 +	${INSTALL_DATA} $^ ${DESTDIR}${mandir}/man5
 +
-+install-man8: named.8 lwresd.8
++install-man8: named.8
 +	${INSTALL_DATA} $^ ${DESTDIR}${mandir}/man8
 +
 +install-man: install-man5 install-man8
 +
-+install:: named@EXEEXT@ lwresd@EXEEXT@ installdirs install-man
++install:: named@EXEEXT@ installdirs install-man
  	${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} named@EXEEXT@ ${DESTDIR}${sbindir}
- 	(cd ${DESTDIR}${sbindir}; rm -f lwresd@EXEEXT@; @LN@ named@EXEEXT@ lwresd@EXEEXT@)
 -	${INSTALL_DATA} ${srcdir}/named.8 ${DESTDIR}${mandir}/man8
--	${INSTALL_DATA} ${srcdir}/lwresd.8 ${DESTDIR}${mandir}/man8
 -	${INSTALL_DATA} ${srcdir}/named.conf.5 ${DESTDIR}${mandir}/man5
  
  uninstall::
  	rm -f ${DESTDIR}${mandir}/man5/named.conf.5
 diff --git a/bin/pkcs11/Makefile.in b/bin/pkcs11/Makefile.in
-index ae90616..a058c91 100644
+index 2fd9861..96aec05 100644
 --- a/bin/pkcs11/Makefile.in
 +++ b/bin/pkcs11/Makefile.in
-@@ -71,7 +71,10 @@ installdirs:
+@@ -69,7 +69,10 @@ installdirs:
  	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${sbindir}
  	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${mandir}/man8
  
@@ -167,7 +165,7 @@ index ae90616..a058c91 100644
  	${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} pkcs11-list@EXEEXT@ \
  		${DESTDIR}${sbindir}
  	${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} pkcs11-destroy@EXEEXT@ \
-@@ -80,10 +83,6 @@ install:: ${TARGETS} installdirs
+@@ -78,10 +81,6 @@ install:: ${TARGETS} installdirs
  		${DESTDIR}${sbindir}
  	${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} pkcs11-tokens@EXEEXT@ \
  		${DESTDIR}${sbindir}
@@ -201,10 +199,10 @@ index aa678d4..064c404 100644
  		if test -n "${DESTDIR}" ; then \
  			${PYTHON} ${srcdir}/setup.py install --root=${DESTDIR} --prefix=${prefix} @PYTHON_INSTALL_LIB@ ; \
 diff --git a/bin/tools/Makefile.in b/bin/tools/Makefile.in
-index 7bf2af4..c395bc7 100644
+index 0fd2847..3c4f028 100644
 --- a/bin/tools/Makefile.in
 +++ b/bin/tools/Makefile.in
-@@ -119,17 +119,27 @@ installdirs:
+@@ -107,17 +107,27 @@ installdirs:
  	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${mandir}/man1
  	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${mandir}/man8
  
@@ -237,20 +235,18 @@ index 7bf2af4..c395bc7 100644
  	${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} arpaname@EXEEXT@ \
  		${DESTDIR}${bindir}
  	${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} named-journalprint@EXEEXT@ \
-@@ -144,13 +154,8 @@ install:: ${TARGETS} installdirs @DNSTAP@ @NZD_TOOLS@
+@@ -128,11 +138,6 @@ install:: ${TARGETS} installdirs @DNSTAP@ @NZD_TOOLS@
  		${DESTDIR}${sbindir}
  	${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} mdig@EXEEXT@ \
  		${DESTDIR}${bindir}
 -	${INSTALL_DATA} ${srcdir}/arpaname.1 ${DESTDIR}${mandir}/man1
- 	${INSTALL_DATA} ${srcdir}/isc-hmac-fixup.8 ${DESTDIR}${mandir}/man8
 -	${INSTALL_DATA} ${srcdir}/named-journalprint.8 ${DESTDIR}${mandir}/man8
 -	${INSTALL_DATA} ${srcdir}/named-rrchecker.1 ${DESTDIR}${mandir}/man1
 -	${INSTALL_DATA} ${srcdir}/nsec3hash.8 ${DESTDIR}${mandir}/man8
- 	${INSTALL_DATA} ${srcdir}/genrandom.8 ${DESTDIR}${mandir}/man8
 -	${INSTALL_DATA} ${srcdir}/mdig.1 ${DESTDIR}${mandir}/man1
  
  uninstall::
  	rm -f ${DESTDIR}${mandir}/man1/mdig.1
 -- 
-2.14.4
+2.20.1
 
diff --git a/bind-9.11-pk11.patch b/bind-9.11-pk11.patch
index d802314..fd75a6c 100644
--- a/bind-9.11-pk11.patch
+++ b/bind-9.11-pk11.patch
@@ -1,17 +1,3 @@
-diff --git a/lib/dns/dst_internal.h b/lib/dns/dst_internal.h
-index 640519a..fc40472 100644
---- a/lib/dns/dst_internal.h
-+++ b/lib/dns/dst_internal.h
-@@ -59,6 +59,9 @@
- #include <openssl/objects.h>
- #include <openssl/rsa.h>
- #endif
-+#if PKCS11CRYPTO
-+#include <pk11/pk11.h>
-+#endif
- 
- ISC_LANG_BEGINDECLS
- 
 diff --git a/lib/isc/include/pk11/internal.h b/lib/isc/include/pk11/internal.h
 index aa8907a..603712a 100644
 --- a/lib/isc/include/pk11/internal.h
diff --git a/bind-9.11-rh1205168.patch b/bind-9.11-rh1205168.patch
deleted file mode 100644
index 181cec9..0000000
--- a/bind-9.11-rh1205168.patch
+++ /dev/null
@@ -1,120 +0,0 @@
-From 90416594843a56550e40b11561807786219ce1c4 Mon Sep 17 00:00:00 2001
-From: Evan Hunt <each@isc.org>
-Date: Mon, 11 Sep 2017 15:01:36 -0700
-Subject: [PATCH] remap getaddrinfo() to irs_getgetaddrinfo()
-
-The libirs version of getaddrinfo() cannot be called from within BIND9.
-
-fix prototypes
----
- lib/irs/include/irs/netdb.h.in | 94 ++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 94 insertions(+)
-
-diff --git a/lib/irs/include/irs/netdb.h.in b/lib/irs/include/irs/netdb.h.in
-index 23dcd37..f36113d 100644
---- a/lib/irs/include/irs/netdb.h.in
-+++ b/lib/irs/include/irs/netdb.h.in
-@@ -150,6 +150,100 @@ struct addrinfo {
- #define	NI_DGRAM	0x00000010
- 
- /*
-+ * Define to map into irs_ namespace.
-+ */
-+
-+#define IRS_NAMESPACE
-+
-+#ifdef IRS_NAMESPACE
-+
-+/*
-+ * Use our versions not the ones from the C library.
-+ */
-+
-+#ifdef getnameinfo
-+#undef getnameinfo
-+#endif
-+#define getnameinfo irs_getnameinfo
-+
-+#ifdef getaddrinfo
-+#undef getaddrinfo
-+#endif
-+#define getaddrinfo irs_getaddrinfo
-+
-+#ifdef freeaddrinfo
-+#undef freeaddrinfo
-+#endif
-+#define freeaddrinfo irs_freeaddrinfo
-+
-+#ifdef gai_strerror
-+#undef gai_strerror
-+#endif
-+#define gai_strerror irs_gai_strerror
-+
-+#endif
-+
-+extern int getaddrinfo (const char *name,
-+			const char *service,
-+			const struct addrinfo *req,
-+			struct addrinfo **pai);
-+extern int getnameinfo (const struct sockaddr *sa,
-+			socklen_t salen, char *host,
-+			socklen_t hostlen, char *serv,
-+			socklen_t servlen, int flags);
-+extern void freeaddrinfo (struct addrinfo *ai);
-+extern const char *gai_strerror (int ecode);
-+
-+/*
-+ * Define to map into irs_ namespace.
-+ */
-+
-+#define IRS_NAMESPACE
-+
-+#ifdef IRS_NAMESPACE
-+
-+/*
-+ * Use our versions not the ones from the C library.
-+ */
-+
-+#ifdef getnameinfo
-+#undef getnameinfo
-+#endif
-+#define getnameinfo irs_getnameinfo
-+
-+#ifdef getaddrinfo
-+#undef getaddrinfo
-+#endif
-+#define getaddrinfo irs_getaddrinfo
-+
-+#ifdef freeaddrinfo
-+#undef freeaddrinfo
-+#endif
-+#define freeaddrinfo irs_freeaddrinfo
-+
-+#ifdef gai_strerror
-+#undef gai_strerror
-+#endif
-+#define gai_strerror irs_gai_strerror
-+
-+int
-+getaddrinfo(const char *hostname, const char *servname,
-+	    const struct addrinfo *hints, struct addrinfo **res);
-+
-+int
-+getnameinfo(const struct sockaddr *sa, IRS_GETNAMEINFO_SOCKLEN_T salen,
-+	    char *host, IRS_GETNAMEINFO_BUFLEN_T hostlen,
-+	    char *serv, IRS_GETNAMEINFO_BUFLEN_T servlen,
-+	    IRS_GETNAMEINFO_FLAGS_T flags);
-+
-+void freeaddrinfo (struct addrinfo *ai);
-+
-+IRS_GAISTRERROR_RETURN_T
-+gai_strerror(int ecode);
-+
-+#endif
-+
-+/*
-  * Tell Emacs to use C mode on this file.
-  * Local variables:
-  * mode: c
--- 
-2.9.5
-
diff --git a/bind-9.9.1-P2-multlib-conflict.patch b/bind-9.9.1-P2-multlib-conflict.patch
index 8768b86..1de1e04 100644
--- a/bind-9.9.1-P2-multlib-conflict.patch
+++ b/bind-9.9.1-P2-multlib-conflict.patch
@@ -1,18 +1,5 @@
-diff --git a/config.h.in b/config.h.in
-index 4ecaa8f..2f65ccc 100644
---- a/config.h.in
-+++ b/config.h.in
-@@ -600,7 +600,7 @@ int sigwait(const unsigned int *set, int *sig);
- #undef PREFER_GOSTASN1
- 
- /* The size of `void *', as computed by sizeof. */
--#undef SIZEOF_VOID_P
-+/* #undef SIZEOF_VOID_P */
- 
- /* Define to 1 if you have the ANSI C header files. */
- #undef STDC_HEADERS
 diff --git a/isc-config.sh.in b/isc-config.sh.in
-index a8a0a89..b5e94ed 100644
+index 40f9bba..e446da2 100644
 --- a/isc-config.sh.in
 +++ b/isc-config.sh.in
 @@ -13,7 +13,18 @@ prefix=@prefix@
@@ -35,7 +22,7 @@ index a8a0a89..b5e94ed 100644
  
  usage()
  {
-@@ -132,6 +143,16 @@ if test x"$echo_libs" = x"true"; then
+@@ -128,6 +139,16 @@ if test x"$echo_libs" = x"true"; then
  	if test x"${exec_prefix_set}" = x"true"; then
  		libs="-L${exec_prefix}/lib"
  	else
diff --git a/bind-95-rh452060.patch b/bind-95-rh452060.patch
deleted file mode 100644
index c57ccab..0000000
--- a/bind-95-rh452060.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff --git a/bin/dig/dighost.c b/bin/dig/dighost.c
-index aa5315d..1fa711a 100644
---- a/bin/dig/dighost.c
-+++ b/bin/dig/dighost.c
-@@ -1814,6 +1814,13 @@ clear_query(dig_query_t *query) {
- 
- 	if (query->timer != NULL)
- 		isc_timer_detach(&query->timer);
-+
-+	if (query->waiting_senddone) {
-+		debug("send_done not yet called");
-+		query->pending_free = true;
-+		return;
-+	}
-+
- 	lookup = query->lookup;
- 
- 	if (lookup->current_query == query)
-@@ -1839,10 +1846,7 @@ clear_query(dig_query_t *query) {
- 	isc_mempool_put(commctx, query->recvspace);
- 	isc_buffer_invalidate(&query->recvbuf);
- 	isc_buffer_invalidate(&query->lengthbuf);
--	if (query->waiting_senddone)
--		query->pending_free = true;
--	else
--		isc_mem_free(mctx, query);
-+	isc_mem_free(mctx, query);
- }
- 
- /*%
-@@ -2892,9 +2896,9 @@ send_done(isc_task_t *_task, isc_event_t *event) {
- 	isc_event_free(&event);
- 
- 	if (query->pending_free)
--		isc_mem_free(mctx, query);
-+		clear_query(query);
- 
--	check_if_done();
-+	check_next_lookup(l);
- 	UNLOCK_LOOKUP;
- }
- 
diff --git a/bind.spec b/bind.spec
index 3e2de10..bf07be7 100644
--- a/bind.spec
+++ b/bind.spec
@@ -63,8 +63,8 @@
 Summary:  The Berkeley Internet Name Domain (BIND) DNS (Domain Name System) server
 Name:     bind
 License:  MPLv2.0
-Version:  9.11.14
-Release:  4%{?PATCHVER:.%{PATCHVER}}%{?PREVER:.%{PREVER}}%{?dist}
+Version:  9.14.0
+Release:  0%{?PATCHVER:.%{PATCHVER}}%{?PREVER:.%{PREVER}}%{?dist}
 Epoch:    32
 Url:      https://www.isc.org/downloads/bind/
 #
@@ -113,9 +113,7 @@ Patch10: bind-9.5-PIE.patch
 Patch16: bind-9.3.2-redhat_doc.patch
 Patch72: bind-9.5-dlz-64bit.patch
 Patch101:bind-96-old-api.patch
-Patch102:bind-95-rh452060.patch
 Patch106:bind93-rh490837.patch
-Patch109:bind97-rh478718.patch
 Patch112:bind97-rh645544.patch
 Patch130:bind-9.9.1-P2-dlz-libdb.patch
 Patch131:bind-9.9.1-P2-multlib-conflict.patch
@@ -128,7 +126,6 @@ Patch136:bind-9.10-dist-native-pkcs11.patch
 # introduced by https://source.isc.org/cgi-bin/gitweb.cgi?p=bind9.git;a=commit;h=fc9f0ac5778f78003a7acc957a23711811fec122
 Patch137:bind-9.10-use-of-strlcat.patch
 Patch140:bind-9.11-rh1410433.patch
-Patch145:bind-9.11-rh1205168.patch
 # [ISC-Bugs #46853] commit cb616c6d5c2ece1fac37fa6e0bca2b53d4043098 ISC 4851
 Patch149:bind-9.11-kyua-pkcs11.patch
 # Avoid conflicts with OpenSSL PKCS11 engine
@@ -540,14 +537,11 @@ are used for building ISC DHCP.
 %patch10 -p1 -b .PIE
 %patch16 -p1 -b .redhat_doc
 %patch72 -p1 -b .64bit
-%patch102 -p1 -b .rh452060
 %patch106 -p1 -b .rh490837
-%patch109 -p1 -b .rh478718
 %patch112 -p1 -b .rh645544
 %patch130 -p1 -b .libdb
 %patch131 -p1 -b .multlib-conflict
 %patch140 -p1 -b .rh1410433
-%patch145 -p1 -b .rh1205168
 %patch153 -p1 -b .export_suffix
 %patch154 -p1 -b .oot-man
 %patch155 -p1 -b .pk11-internal
diff --git a/bind93-rh490837.patch b/bind93-rh490837.patch
index 6ea55ba..6390c2f 100644
--- a/bind93-rh490837.patch
+++ b/bind93-rh490837.patch
@@ -13,14 +13,14 @@ index 1f44b5a..a3625f9 100644
  
  #endif /* ISC_STDIO_H */
 diff --git a/lib/isc/lex.c b/lib/isc/lex.c
-index a8955bc..fc6103b 100644
+index ca5fe6d..b0152eb 100644
 --- a/lib/isc/lex.c
 +++ b/lib/isc/lex.c
-@@ -434,17 +434,14 @@ isc_lex_gettoken(isc_lex_t *lex, unsigned int options, isc_token_t *tokenp) {
+@@ -433,15 +433,11 @@ isc_lex_gettoken(isc_lex_t *lex, unsigned int options, isc_token_t *tokenp) {
  			if (source->is_file) {
  				stream = source->input;
  
--#if defined(HAVE_FLOCKFILE) && defined(HAVE_GETCUNLOCKED)
+-#if defined(HAVE_FLOCKFILE) && defined(HAVE_GETC_UNLOCKED)
 -				c = getc_unlocked(stream);
 -#else
 -				c = getc(stream);
@@ -36,15 +36,12 @@ index a8955bc..fc6103b 100644
 +						source->result = result;
  						goto done;
  					}
-+
  					source->at_eof = true;
- 				}
- 			} else {
 diff --git a/lib/isc/unix/errno2result.c b/lib/isc/unix/errno2result.c
-index 2f12bcc..5bfd648 100644
+index d72d56f..4287ff3 100644
 --- a/lib/isc/unix/errno2result.c
 +++ b/lib/isc/unix/errno2result.c
-@@ -40,6 +40,7 @@ isc___errno2result(int posixerrno, bool dolog,
+@@ -42,6 +42,7 @@ isc___errno2result(int posixerrno, bool dolog,
  	case EINVAL:		/* XXX sometimes this is not for files */
  	case ENAMETOOLONG:
  	case EBADF:
@@ -53,10 +50,10 @@ index 2f12bcc..5bfd648 100644
  	case ENOENT:
  		return (ISC_R_FILENOTFOUND);
 diff --git a/lib/isc/unix/stdio.c b/lib/isc/unix/stdio.c
-index e60fa65..77f0b13 100644
+index d2b1dda..79630b2 100644
 --- a/lib/isc/unix/stdio.c
 +++ b/lib/isc/unix/stdio.c
-@@ -149,3 +149,22 @@ isc_stdio_sync(FILE *f) {
+@@ -141,3 +141,22 @@ isc_stdio_sync(FILE *f) {
  		return (isc__errno2result(errno));
  }
  
@@ -68,7 +65,7 @@ index e60fa65..77f0b13 100644
 +#if defined(HAVE_FLOCKFILE) && defined(HAVE_GETCUNLOCKED)
 +	r = fgetc_unlocked(f);
 +#else
-+	r = fgets(f);
++	r = fgetc(f);
 +#endif
 +
 +	if (r == EOF)
diff --git a/bind97-rh478718.patch b/bind97-rh478718.patch
deleted file mode 100644
index dfc4165..0000000
--- a/bind97-rh478718.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 26c509e..c1bfd62 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -4152,6 +4152,10 @@ if test "yes" = "$use_atomic"; then
- 	AC_MSG_RESULT($arch)
- fi
- 
-+if test ! "$arch" = "x86_64" -a "$have_xaddq" = "yes"; then
-+	AC_MSG_ERROR([XADDQ present but disabled by Fedora patch!])
-+fi
-+
- if test "yes" = "$have_atomic"; then
- 	AC_MSG_CHECKING([compiler support for inline assembly code])
- 
-diff --git a/lib/isc/include/isc/platform.h.in b/lib/isc/include/isc/platform.h.in
-index c902d46..9c7c342 100644
---- a/lib/isc/include/isc/platform.h.in
-+++ b/lib/isc/include/isc/platform.h.in
-@@ -284,19 +284,25 @@
-  * If the "xaddq" operation (64bit xadd) is available on this architecture,
-  * ISC_PLATFORM_HAVEXADDQ will be defined.
-  */
--@ISC_PLATFORM_HAVEXADDQ@
- 
- /*
-- * If the 32-bit "atomic swap" operation is available on this
-- * architecture, ISC_PLATFORM_HAVEATOMICSTORE" will be defined.
-+ * If the 64-bit "atomic swap" operation is available on this
-+ * architecture, ISC_PLATFORM_HAVEATOMICSTOREQ" will be defined.
-  */
--@ISC_PLATFORM_HAVEATOMICSTORE@
-+
-+#ifdef __x86_64__
-+#define ISC_PLATFORM_HAVEXADDQ 1
-+#define ISC_PLATFORM_HAVEATOMICSTOREQ 1
-+#else
-+#undef ISC_PLATFORM_HAVEXADDQ
-+#undef ISC_PLATFORM_HAVEATOMICSTOREQ
-+#endif
- 
- /*
-- * If the 64-bit "atomic swap" operation is available on this
-+ * If the 32-bit "atomic swap" operation is available on this
-  * architecture, ISC_PLATFORM_HAVEATOMICSTORE" will be defined.
-  */
--@ISC_PLATFORM_HAVEATOMICSTOREQ@
-+@ISC_PLATFORM_HAVEATOMICSTORE@
- 
- /*
-  * If the "compare-and-exchange" operation is available on this architecture,
diff --git a/bind97-rh645544.patch b/bind97-rh645544.patch
index d1d8429..282fa2f 100644
--- a/bind97-rh645544.patch
+++ b/bind97-rh645544.patch
@@ -1,7 +1,8 @@
-diff -up bind-9.9.4rc2/lib/dns/resolver.c.rh645544 bind-9.9.4rc2/lib/dns/resolver.c
---- bind-9.9.4rc2/lib/dns/resolver.c.rh645544	2013-08-19 10:30:52.000000000 +0200
-+++ bind-9.9.4rc2/lib/dns/resolver.c	2013-09-06 17:58:03.864165823 +0200
-@@ -1138,7 +1138,7 @@ log_edns(fetchctx_t *fctx) {
+diff --git a/lib/dns/resolver.c b/lib/dns/resolver.c
+index 2a6e69c..b2f8cec 100644
+--- a/lib/dns/resolver.c
++++ b/lib/dns/resolver.c
+@@ -1676,7 +1676,7 @@ log_edns(fetchctx_t *fctx) {
  	 */
  	dns_name_format(&fctx->domain, domainbuf, sizeof(domainbuf));
  	isc_log_write(dns_lctx, DNS_LOGCATEGORY_EDNS_DISABLED,
@@ -9,8 +10,8 @@ diff -up bind-9.9.4rc2/lib/dns/resolver.c.rh645544 bind-9.9.4rc2/lib/dns/resolve
 +		      DNS_LOGMODULE_RESOLVER, ISC_LOG_DEBUG(1),
  		      "success resolving '%s' (in '%s'?) after %s",
  		      fctx->info, domainbuf, fctx->reason);
- 
-@@ -3804,7 +3804,7 @@ log_lame(fetchctx_t *fctx, dns_adbaddrin
+ }
+@@ -5084,7 +5084,7 @@ log_lame(fetchctx_t *fctx, dns_adbaddrinfo_t *addrinfo) {
  	dns_name_format(&fctx->domain, domainbuf, sizeof(domainbuf));
  	isc_sockaddr_format(&addrinfo->sockaddr, addrbuf, sizeof(addrbuf));
  	isc_log_write(dns_lctx, DNS_LOGCATEGORY_LAME_SERVERS,
@@ -19,7 +20,7 @@ diff -up bind-9.9.4rc2/lib/dns/resolver.c.rh645544 bind-9.9.4rc2/lib/dns/resolve
  		      "lame server resolving '%s' (in '%s'?): %s",
  		      namebuf, domainbuf, addrbuf);
  }
-@@ -3831,7 +3831,7 @@ log_formerr(fetchctx_t *fctx, const char
+@@ -5111,7 +5111,7 @@ log_formerr(fetchctx_t *fctx, const char *format, ...) {
  	}
  
  	isc_log_write(dns_lctx, DNS_LOGCATEGORY_RESOLVER,