diff --git a/bind.spec b/bind.spec
index eb69cd8..d443bdb 100644
--- a/bind.spec
+++ b/bind.spec
@@ -24,7 +24,7 @@ Summary:  The Berkeley Internet Name Domain (BIND) DNS (Domain Name System) serv
 Name:     bind
 License:  ISC
 Version:  9.9.6
-Release:  5%{?PATCHVER:.%{PATCHVER}}%{?PREVER:.%{PREVER}}%{?dist}
+Release:  6%{?PATCHVER:.%{PATCHVER}}%{?PREVER:.%{PREVER}}%{?dist}
 Epoch:    32
 Url:      http://www.isc.org/products/BIND/
 Buildroot:%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -1022,6 +1022,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %endif
 
 %changelog
+* Fri Dec 12 2014 Tomas Hozza <thozza@redhat.com> - 32:9.9.6-6.P1
+- Fix host/nslookup crash when remote server could not be reached (#1172935)
+
 * Tue Dec 09 2014 Tomas Hozza <thozza@redhat.com> - 32:9.9.6-5.P1
 - Update to 9.9.6-P1 (CVE-2014-8500)
 
diff --git a/nslookup-norec.patch b/nslookup-norec.patch
index 77350ad..d4ed851 100644
--- a/nslookup-norec.patch
+++ b/nslookup-norec.patch
@@ -6,7 +6,7 @@
  		fputs(l->cmdline, stdout);
 -		printf(";; connection timed out; no servers could be "
 -		       "reached\n");
-+		if (!next_origin(ISC_LIST_HEAD(l->q))) {
++		if (!next_origin(l)) {
 +			printf(";; connection timed out; no servers could be "
 +			       "reached\n");
 +		} else {