diff --git a/CHANGES b/CHANGES
index 22be51b339..1b4357f882 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+1373.	[bug]		Recovery from expired glue failed under certian
+			circumstances.
+
 1372.	[bug]		named crashes with an assertion failure on exit when
 			sharing the same port for listening and querying, and
 			changing listening addresses several times. [RT# 3509]
diff --git a/lib/dns/resolver.c b/lib/dns/resolver.c
index 6c7df34f66..2c35a6736c 100644
--- a/lib/dns/resolver.c
+++ b/lib/dns/resolver.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: resolver.c,v 1.250 2002/09/09 02:54:18 marka Exp $ */
+/* $Id: resolver.c,v 1.251 2002/09/10 00:53:30 marka Exp $ */
 
 #include <config.h>
 
@@ -4646,6 +4646,7 @@ resquery_response(isc_task_t *task, isc_event_t *event) {
 		}
 
 		if (get_nameservers) {
+			dns_name_t *name;
 			dns_fixedname_init(&foundname);
 			fname = dns_fixedname_name(&foundname);
 			if (result != ISC_R_SUCCESS) {
@@ -4653,9 +4654,12 @@ resquery_response(isc_task_t *task, isc_event_t *event) {
 				return;
 			}
 			findoptions = 0;
+			if ((options & DNS_FETCHOPT_UNSHARED) == 0)
+				name = &fctx->name;
+			else
+				name = &fctx->domain;
 			result = dns_view_findzonecut(fctx->res->view,
-						      &fctx->name,
-						      fname,
+						      name, fname,
 						      now, 0, ISC_TRUE,
 						      &fctx->nameservers,
 						      NULL);