diff --git a/CHANGES b/CHANGES
index ff110c319a..970ec3767e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+	--- 9.9.0b2 released ---
+
+3219.	[bug]		Disable NOEDNS caching following a timeout.
+
 3218.	[security]	Cache lookup could return RRSIG data associated with
 			nonexistent records, leading to an assertion
 			failure. [RT #26590]
diff --git a/lib/bind9/api b/lib/bind9/api
index 3d2fa6efd1..6404d993e5 100644
--- a/lib/bind9/api
+++ b/lib/bind9/api
@@ -1,3 +1,3 @@
 LIBINTERFACE = 90
-LIBREVISION = 0
+LIBREVISION = 1
 LIBAGE = 0
diff --git a/lib/dns/api b/lib/dns/api
index 3d2fa6efd1..580ddcfd7a 100644
--- a/lib/dns/api
+++ b/lib/dns/api
@@ -1,3 +1,3 @@
-LIBINTERFACE = 90
+LIBINTERFACE = 91
 LIBREVISION = 0
-LIBAGE = 0
+LIBAGE = 1
diff --git a/lib/dns/include/dns/resolver.h b/lib/dns/include/dns/resolver.h
index ec676ee888..ea024982ee 100644
--- a/lib/dns/include/dns/resolver.h
+++ b/lib/dns/include/dns/resolver.h
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: resolver.h,v 1.70 2011/11/04 03:38:44 marka Exp $ */
+/* $Id: resolver.h,v 1.71 2011/11/16 22:18:52 marka Exp $ */
 
 #ifndef DNS_RESOLVER_H
 #define DNS_RESOLVER_H 1
@@ -96,7 +96,7 @@ typedef struct dns_fetchevent {
 #define DNS_FETCHOPT_EDNS512		0x40	     /*%< Advertise a 512 byte
 							  UDP buffer. */
 #define DNS_FETCHOPT_WANTNSID           0x80         /*%< Request NSID */
-#define DNS_FETCHOPT_CACHENOEDNS        0x100A	     /*%< This is a candidate
+#define DNS_FETCHOPT_CACHENOEDNS        0x100	     /*%< This is a candidate
 							  for setting NOEDNS
 							  in adb. */
 
diff --git a/lib/dns/resolver.c b/lib/dns/resolver.c
index 266ea01a95..e6933f3f2e 100644
--- a/lib/dns/resolver.c
+++ b/lib/dns/resolver.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: resolver.c,v 1.441 2011/11/15 21:44:53 each Exp $ */
+/* $Id: resolver.c,v 1.442 2011/11/16 22:18:52 marka Exp $ */
 
 /*! \file */
 
@@ -6580,6 +6580,7 @@ resquery_response(isc_task_t *task, isc_event_t *event) {
 			}
 		}
 		goto done;
+#if 0
 	} else if ((query->options & DNS_FETCHOPT_NOEDNS0) != 0 &&
 		   (query->options & DNS_FETCHOPT_CACHENOEDNS) != 0 &&
 		   triededns512(fctx, &query->addrinfo->sockaddr)) {
@@ -6597,6 +6598,7 @@ resquery_response(isc_task_t *task, isc_event_t *event) {
 		dns_adb_changeflags(fctx->adb, query->addrinfo,
 				    DNS_FETCHOPT_NOEDNS0,
 				    DNS_FETCHOPT_NOEDNS0);
+#endif
 	}
 
 	message = fctx->rmessage;
diff --git a/lib/dns/win32/libdns.def b/lib/dns/win32/libdns.def
index 5eaaad7219..7ddceb0bcd 100644
--- a/lib/dns/win32/libdns.def
+++ b/lib/dns/win32/libdns.def
@@ -932,6 +932,8 @@ dns_zonemgr_setsize
 dns_zonemgr_settransfersin
 dns_zonemgr_settransfersperns
 dns_zonemgr_shutdown
+dns_zonemgr_unreachable
+dns_zonemgr_unreachabledel
 dns_zt_apply
 dns_zt_attach
 dns_zt_create
diff --git a/lib/isc/api b/lib/isc/api
index 3d2fa6efd1..6404d993e5 100644
--- a/lib/isc/api
+++ b/lib/isc/api
@@ -1,3 +1,3 @@
 LIBINTERFACE = 90
-LIBREVISION = 0
+LIBREVISION = 1
 LIBAGE = 0
diff --git a/lib/isccfg/api b/lib/isccfg/api
index 3d2fa6efd1..6404d993e5 100644
--- a/lib/isccfg/api
+++ b/lib/isccfg/api
@@ -1,3 +1,3 @@
 LIBINTERFACE = 90
-LIBREVISION = 0
+LIBREVISION = 1
 LIBAGE = 0
diff --git a/version b/version
index 780e332cdf..cb38a921a0 100644
--- a/version
+++ b/version
@@ -1,4 +1,4 @@
-# $Id: version,v 1.57 2011/10/28 12:02:31 marka Exp $
+# $Id: version,v 1.58 2011/11/16 22:18:51 marka Exp $
 # 
 # This file must follow /bin/sh rules.  It is imported directly via
 # configure.
@@ -7,4 +7,4 @@ MAJORVER=9
 MINORVER=9
 PATCHVER=0
 RELEASETYPE=b
-RELEASEVER=1
+RELEASEVER=2