diff --git a/bind-dyndb-ldap-pspacek-0432-2-Prevent-crash-while-reloading-previously-invalid-but.patch b/bind-dyndb-ldap-pspacek-0432-2-Prevent-crash-while-reloading-previously-invalid-but.patch
new file mode 100644
index 0000000..17759be
--- /dev/null
+++ b/bind-dyndb-ldap-pspacek-0432-2-Prevent-crash-while-reloading-previously-invalid-but.patch
@@ -0,0 +1,34 @@
+From 9ae1320d0c71d95e0f9785afa922c5b3240ea66d Mon Sep 17 00:00:00 2001
+From: Petr Spacek <pspacek@redhat.com>
+Date: Fri, 22 Jul 2016 16:44:17 +0200
+Subject: [PATCH] Prevent crash while reloading previously invalid but now
+ valid DNS zone.
+
+The crash happened under these circumstances:
+- a DNS zone (test.) has NS record relative to this zone (ns.test.)
+- the name pointed to by NS record did not have any A/AAAA records
+- restart BIND to enforce zone load
+- zone loading failed because of invalid NS record
+- missing A/AAAA record for name ns.test. was added
+-> CRASH!
+
+https://fedorahosted.org/bind-dyndb-ldap/ticket/166
+---
+ src/ldap_helper.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/ldap_helper.c b/src/ldap_helper.c
+index 681661b8910c8213030f38aa9ba38eee748d3109..12a743b095ba400373cb87653d26af82cc95c2ea 100644
+--- a/src/ldap_helper.c
++++ b/src/ldap_helper.c
+@@ -3824,6 +3824,7 @@ update_record(isc_task_t *task, isc_event_t *event)
+ update_restart:
+ 	rbtdb = NULL;
+ 	ldapdb = NULL;
++	zone_settings = NULL;
+ 	ldapdb_rdatalist_destroy(mctx, &rdatalist);
+ 	CHECK(zr_get_zone_dbs(inst->zone_register, &entry->zone_name, &ldapdb, &rbtdb));
+ 	CHECK(dns_db_newversion(ldapdb, &version));
+-- 
+2.7.4
+
diff --git a/bind-dyndb-ldap.spec b/bind-dyndb-ldap.spec
index 20d5816..993cdce 100644
--- a/bind-dyndb-ldap.spec
+++ b/bind-dyndb-ldap.spec
@@ -2,7 +2,7 @@
 
 Name:           bind-dyndb-ldap
 Version:        10.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        LDAP back-end plug-in for BIND
 
 Group:          System Environment/Libraries
@@ -10,6 +10,7 @@ License:        GPLv2+
 URL:            https://fedorahosted.org/bind-dyndb-ldap
 Source0:        https://fedorahosted.org/released/%{name}/%{name}-%{VERSION}.tar.bz2
 Source1:        https://fedorahosted.org/released/%{name}/%{name}-%{VERSION}.tar.bz2.asc
+Patch0:         bind-dyndb-ldap-pspacek-0432-2-Prevent-crash-while-reloading-previously-invalid-but.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  bind-devel >= 32:9.9.0-1, bind-lite-devel >= 32:9.9.0-1
@@ -28,6 +29,7 @@ off of your LDAP server.
 
 %prep
 %setup -q -n %{name}-%{VERSION}
+%patch0 -p1
 
 %build
 autoreconf -fiv
@@ -76,6 +78,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Jul 27 2016 Petr Spacek <pspacek@redhat.com> - 10.0-2
+- Backport fix for crash https://fedorahosted.org/bind-dyndb-ldap/ticket/166
+
 * Tue Jun 21 2016 Petr Spacek <pspacek@redhat.com> - 10.0-1
 - Update to 10.0