diff --git a/SOURCES/dhcp-4.2.5-centos-branding.patch b/SOURCES/dhcp-4.2.5-centos-branding.patch
deleted file mode 100644
index f3e7113..0000000
--- a/SOURCES/dhcp-4.2.5-centos-branding.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -uNrp dhcp-4.1.1-P1.orig/omapip/errwarn.c dhcp-4.1.1-P1/omapip/errwarn.c
---- dhcp-4.1.1-P1.orig/omapip/errwarn.c 2012-08-15 14:04:33.149141000 +0000
-+++ dhcp-4.1.1-P1/omapip/errwarn.c      2012-08-15 14:13:05.582416057 +0000
-@@ -81,8 +81,8 @@ void log_fatal (const char * fmt, ... )
-   log_error ("have been made to the base software release in order to make");
-   log_error ("it work better with this distribution.");
-   log_error ("%s", "");
--  log_error ("Please report for this software via the Red Hat Bugzilla site:");
--  log_error ("    http://bugzilla.redhat.com");
-+  log_error ("Please report for this software via the CentOS Bugs Database:");
-+  log_error ("    http://bugs.centos.org/");
-   log_error ("%s", "");
-   log_error ("exiting.");
- #endif
diff --git a/SOURCES/dhcp-4.2.5-reap_orphan_sockets.patch b/SOURCES/dhcp-4.2.5-reap_orphan_sockets.patch
new file mode 100644
index 0000000..0ffcfe3
--- /dev/null
+++ b/SOURCES/dhcp-4.2.5-reap_orphan_sockets.patch
@@ -0,0 +1,52 @@
+commit ccff9ed69d0b26d33ce9cac8e83dab535b64d627
+Author: Thomas Markwalder <tmark@isc.org>
+Date:   Tue Dec 5 15:12:34 2017 -0500
+
+    [46767] Plugged a socket descriptor leak in OMAPI
+    
+    If disconnect is triggered by the reader closing the socket, while there
+    is data left to write, the socket would be orphaned.
+    
+    omapip/buffer.c
+        omapi_connection_writea() - added logic to recall disconnect once
+        pending data has been written
+    
+    omapip/message.c
+        Removed static declaration from omapi_message_unregister so you can
+        actually compile when DEBUG_PROTOCOL is defined.
+    
+    Added a release note
+
+diff --git a/omapip/buffer.c b/omapip/buffer.c
+index 6e0621b..a21f0a8 100644
+--- a/omapip/buffer.c
++++ b/omapip/buffer.c
+@@ -565,6 +565,15 @@ isc_result_t omapi_connection_writer (omapi_object_t *h)
+ 			omapi_buffer_dereference (&buffer, MDL);
+ 		}
+ 	}
++
++	/* If we had data left to write when we're told to disconnect,
++	* we need recall disconnect, now that we're done writing.
++	* See rt46767. */
++	if (c->out_bytes == 0 && c->state == omapi_connection_disconnecting) {
++		omapi_disconnect (h, 1);
++		return ISC_R_SHUTTINGDOWN;
++	}
++
+ 	return ISC_R_SUCCESS;
+ }
+ 
+diff --git a/omapip/message.c b/omapip/message.c
+index ee15d82..37abbd2 100644
+--- a/omapip/message.c
++++ b/omapip/message.c
+@@ -339,7 +339,7 @@ isc_result_t omapi_message_unregister (omapi_object_t *mo)
+ }
+ 
+ #ifdef DEBUG_PROTOCOL
+-static const char *omapi_message_op_name(int op) {
++const char *omapi_message_op_name(int op) {
+ 	switch (op) {
+ 	case OMAPI_OP_OPEN:    return "OMAPI_OP_OPEN";
+ 	case OMAPI_OP_REFRESH: return "OMAPI_OP_REFRESH";
diff --git a/SPECS/dhcp.spec b/SPECS/dhcp.spec
index 9647a5a..8ee536d 100644
--- a/SPECS/dhcp.spec
+++ b/SPECS/dhcp.spec
@@ -18,7 +18,7 @@
 Summary:  Dynamic host configuration protocol software
 Name:     dhcp
 Version:  4.2.5
-Release:  58%{?dist}
+Release:  58%{?dist}.1
 # NEVER CHANGE THE EPOCH on this package.  The previous maintainer (prior to
 # dcantrell maintaining the package) made incorrect use of the epoch and
 # that's why it is at 12 now.  It should have never been used, but it was.
@@ -97,7 +97,7 @@ Patch61:  dhcp-addignore.patch
 Patch62:  dhcp-max-fd-value.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=1355827
 Patch63:  dhcp-4.2.5-rh1355827.patch
-Patch64:  dhcp-4.2.5-centos-branding.patch
+Patch64:  dhcp-4.2.5-reap_orphan_sockets.patch
 
 BuildRequires: autoconf
 BuildRequires: automake
@@ -407,7 +407,8 @@ rm -rf includes/isc-dhcp
 
 # https://bugzilla.redhat.com/show_bug.cgi?id=1355827
 %patch63 -p1
-%patch64 -p1
+
+%patch64 -p1 -b .omapi_sd_leak
 
 # Update paths in all man pages
 for page in client/dhclient.conf.5 client/dhclient.leases.5 \
@@ -689,8 +690,8 @@ done
 
 
 %changelog
-* Mon Jul 31 2017 CentOS Sources <bugs@centos.org> - 4.2.5-58.el7.centos
-- Roll in CentOS Branding
+* Wed Dec 13 2017 Pavel Zhukov <pzhukov@redhat.com> - 12:4.2.5-58.1
+- Resolves: #1523475 - Fix omapi socket descriptors leak
 
 * Tue May 16 2017 Pavel Zhukov <pzhukov@redhat.com> - 12:4.2.5-58
 - Resolves 1374119: Add dns server variable to azure-cloud.sh script