diff --git a/debian/changelog b/debian/changelog
index 3100fa3..08e7440 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+bind9 (1:9.10.3.dfsg.P4-9) unstable; urgency=medium
+
+ * Fix bad patch from when we switched to quilt. Closes: #820847 LP:
+ #1552801, #1549788, #1553460
+ * freshen patch to remove fuzz.
+
+ -- LaMont Jones <lamont@debian.org> Tue, 26 Apr 2016 15:17:58 -0600
+
bind9 (1:9.10.3.dfsg.P4-8) unstable; urgency=medium
[Timo Aaltonen]
diff --git a/debian/patches/10_min-cache-ttl.diff b/debian/patches/10_min-cache-ttl.diff
index 3bd8474..bd59037 100644
--- a/debian/patches/10_min-cache-ttl.diff
+++ b/debian/patches/10_min-cache-ttl.diff
@@ -153,7 +153,7 @@ Date: Fri Mar 20 15:01:03 2009 -0600
isc_boolean_t optout,
isc_boolean_t secure,
dns_rdataset_t *ardataset,
-@@ -4889,7 +4891,7 @@
+@@ -4888,7 +4890,7 @@
ttl = 0;
result = ncache_adderesult(fctx->rmessage, fctx->cache, node,
@@ -162,7 +162,7 @@ Date: Fri Mar 20 15:01:03 2009 -0600
vevent->secure, ardataset, &eresult);
if (result != ISC_R_SUCCESS)
goto noanswer_response;
-@@ -5352,6 +5354,12 @@
+@@ -5351,6 +5353,12 @@
rdataset->ttl = res->view->maxcachettl;
/*
@@ -175,7 +175,7 @@ Date: Fri Mar 20 15:01:03 2009 -0600
* Mark the rdataset as being prefetch eligible.
*/
if (rdataset->ttl > fctx->res->view->prefetch_eligible)
-@@ -5704,7 +5712,7 @@
+@@ -5703,7 +5711,7 @@
*/
static isc_result_t
ncache_adderesult(dns_message_t *message, dns_db_t *cache, dns_dbnode_t *node,
@@ -184,7 +184,7 @@ Date: Fri Mar 20 15:01:03 2009 -0600
isc_boolean_t optout, isc_boolean_t secure,
dns_rdataset_t *ardataset, isc_result_t *eresultp)
{
-@@ -5717,10 +5725,10 @@
+@@ -5716,10 +5724,10 @@
}
if (secure)
result = dns_ncache_addoptout(message, cache, node, covers,
@@ -197,7 +197,7 @@ Date: Fri Mar 20 15:01:03 2009 -0600
if (result == DNS_R_UNCHANGED || result == ISC_R_SUCCESS) {
/*
* If the cache now contains a negative entry and we
-@@ -5889,7 +5897,7 @@
+@@ -5888,7 +5896,7 @@
ttl = 0;
result = ncache_adderesult(fctx->rmessage, fctx->cache, node,
diff --git a/debian/patches/20_random_1.diff b/debian/patches/20_random_1.diff
index aabb298..cfd2b4f 100644
--- a/debian/patches/20_random_1.diff
+++ b/debian/patches/20_random_1.diff
@@ -28,15 +28,6 @@ Date: Mon Mar 10 11:38:41 2008 -0600
else if (!strcasecmp(str, "cyclic"))
mode = 0;
else
-@@ -6923,8 +6925,6 @@
- if (server->tkeyctx != NULL)
- dns_tkeyctx_destroy(&server->tkeyctx);
-
-- dst_lib_destroy();
--
- isc_event_free(&server->reload_event);
-
- INSIST(ISC_LIST_EMPTY(server->viewlist));
--- a/lib/bind9/check.c
+++ b/lib/bind9/check.c
@@ -147,6 +147,7 @@