diff --git a/0002-Return-control-to-main-loop-on-select-intr.patch b/0002-Return-control-to-main-loop-on-select-intr.patch
new file mode 100644
index 0000000..9056cf7
--- /dev/null
+++ b/0002-Return-control-to-main-loop-on-select-intr.patch
@@ -0,0 +1,76 @@
+From 958c0035aa6a69149c1a0fa218863c26e755d9e6 Mon Sep 17 00:00:00 2001
+From: Ryan McCabe <rmccabe@redhat.com>
+Date: Fri, 19 Jan 2018 11:04:22 -0500
+Subject: [PATCH] fence_virtd: Return control to main loop on select
+ interruption
+
+Return control to the dispatch loop if select is interrupted by a
+signal. The code that retried the select without breaking out of the
+dispatch loop caused the daemon to not be able to be killed cleanly.
+
+Resolves: https://github.com/ClusterLabs/fence-virt/issues/10
+
+Signed-off-by: Ryan McCabe <rmccabe@redhat.com>
+
+diff --git a/server/mcast.c b/server/mcast.c
+index 0336823..e103675 100644
+--- a/server/mcast.c
++++ b/server/mcast.c
+@@ -350,9 +350,14 @@ mcast_dispatch(listener_context_t c, struct timeval *timeout)
+ 	FD_ZERO(&rfds);
+ 	FD_SET(info->mc_sock, &rfds);
+ 
+-	n = _select_retry((info->mc_sock)+1, &rfds, NULL, NULL, timeout);
+-	if (n <= 0)
++	n = select((info->mc_sock)+1, &rfds, NULL, NULL, timeout);
++	if (n <= 0) {
++		if (errno == EINTR || errno == EAGAIN)
++			n = 0;
++		else
++			dbg_printf(2, "select: %s\n", strerror(errno));
+ 		return n;
++	}
+ 	
+ 	slen = sizeof(sin);
+ 	len = recvfrom(info->mc_sock, &data, sizeof(data), 0,
+diff --git a/server/serial.c b/server/serial.c
+index 70eb22b..23d143d 100644
+--- a/server/serial.c
++++ b/server/serial.c
+@@ -272,9 +272,12 @@ serial_dispatch(listener_context_t c, struct timeval *timeout)
+ 	if (info->wake_fd > max)
+ 		max = info->wake_fd;
+ 
+-	n = _select_retry(max+1, &rfds, NULL, NULL, timeout);
+-	if (n < 0) {
+-		dbg_printf(2, "select: %s\n", strerror(errno));
++	n = select(max+1, &rfds, NULL, NULL, timeout);
++	if (n <= 0) {
++		if (errno == EINTR || errno == EAGAIN)
++			n = 0;
++		else
++			dbg_printf(2, "select: %s\n", strerror(errno));
+ 		return n;
+ 	}
+ 
+diff --git a/server/tcp.c b/server/tcp.c
+index 09366b7..bbd347e 100644
+--- a/server/tcp.c
++++ b/server/tcp.c
+@@ -278,9 +278,14 @@ tcp_dispatch(listener_context_t c, struct timeval *timeout)
+ 	FD_ZERO(&rfds);
+ 	FD_SET(info->listen_sock, &rfds);
+ 
+-	n = _select_retry(info->listen_sock + 1, &rfds, NULL, NULL, timeout);
+-	if (n <= 0)
++	n = select(info->listen_sock + 1, &rfds, NULL, NULL, timeout);
++	if (n <= 0) {
++		if (errno == EINTR || errno == EAGAIN)
++			n = 0;
++		else
++			dbg_printf(2, "select: %s\n", strerror(errno));
+ 		return n;
++	}
+ 	
+ 	client_fd = accept(info->listen_sock, NULL, NULL);
+ 	if (client_fd < 0) {
diff --git a/fence-virt.spec b/fence-virt.spec
index 4fd88ca..622156d 100644
--- a/fence-virt.spec
+++ b/fence-virt.spec
@@ -183,6 +183,9 @@ fi
 %{_libdir}/%{name}/cpg.so
 
 %changelog
+* Thu May 31 2018 Ryan McCabe <rmccabe@redhat.com> - 0.4.0-6
+- Return control to the dispatch loop if select is interrupted by a signal.
+
 * Tue May 29 2018 Rafael dos Santos <rdossant@redhat.com> - 0.4.0-5
 - Use Fedora standard build/linker flags (rhbz#1548424)