diff --git a/src/listener.c b/src/listener.c
index b1c6437..3e305c7 100644
--- a/src/listener.c
+++ b/src/listener.c
@@ -538,18 +538,14 @@
 	}
 }
 
-/* This function closes the listening socket for the specified listener,
- * provided that it's already in a listening state. The listener enters the
- * LI_ASSIGNED state, except if the FD is not closed, in which case it may
- * remain in LI_LISTEN. Depending on the process' status (master or worker),
- * the listener's bind options and the receiver's origin, it may or may not
- * close the receiver's FD, according to what is provided at the receiver
- * level. Must be called with the lock held.
+
+/* default function used to unbind a listener. This is for use by standard
+ * protocols working on top of accepted sockets. The receiver's rx_unbind()
+ * will automatically be used after the listener is disabled if the socket is
+ * still bound. This must be used under the listener's lock.
  */
-void do_unbind_listener(struct listener *listener)
+void default_unbind_listener(struct listener *listener)
 {
-	MT_LIST_DEL(&listener->wait_queue);
-
 	if (listener->state <= LI_ASSIGNED)
 		goto out_close;
 
@@ -567,6 +563,20 @@
  out_close:
 	if (listener->rx.flags & RX_F_BOUND)
 		listener->rx.proto->rx_unbind(&listener->rx);
+}
+
+/* This function closes the listening socket for the specified listener,
+ * provided that it's already in a listening state. The protocol's unbind()
+ * is called to put the listener into LI_ASSIGNED or LI_LISTEN and handle
+ * the unbinding tasks. The listener enters then the LI_ASSIGNED state if
+ * the receiver is unbound. Must be called with the lock held.
+ */
+void do_unbind_listener(struct listener *listener)
+{
+	MT_LIST_DEL(&listener->wait_queue);
+
+	if (listener->rx.proto->unbind)
+		listener->rx.proto->unbind(listener);
 
 	/* we may have to downgrade the listener if the rx was closed */
 	if (!(listener->rx.flags & RX_F_BOUND) && listener->state > LI_ASSIGNED)
diff --git a/src/proto_sockpair.c b/src/proto_sockpair.c
index 9eac2cc..4ac5b76 100644
--- a/src/proto_sockpair.c
+++ b/src/proto_sockpair.c
@@ -72,6 +72,7 @@
 	.listen = sockpair_bind_listener,
 	.enable = sockpair_enable_listener,
 	.disable = sockpair_disable_listener,
+	.unbind = default_unbind_listener,
 	.rx_unbind = sock_unbind,
 	.rx_enable = sock_enable,
 	.rx_disable = sock_disable,
diff --git a/src/proto_tcp.c b/src/proto_tcp.c
index 33eacbc..71d13c8 100644
--- a/src/proto_tcp.c
+++ b/src/proto_tcp.c
@@ -64,6 +64,7 @@
 	.listen = tcp_bind_listener,
 	.enable = tcp_enable_listener,
 	.disable = tcp_disable_listener,
+	.unbind = default_unbind_listener,
 	.rx_enable = sock_enable,
 	.rx_disable = sock_disable,
 	.rx_unbind = sock_unbind,
@@ -89,6 +90,7 @@
 	.listen = tcp_bind_listener,
 	.enable = tcp_enable_listener,
 	.disable = tcp_disable_listener,
+	.unbind = default_unbind_listener,
 	.rx_enable = sock_enable,
 	.rx_disable = sock_disable,
 	.rx_unbind = sock_unbind,
diff --git a/src/proto_udp.c b/src/proto_udp.c
index 8c53c62..1c2477e 100644
--- a/src/proto_udp.c
+++ b/src/proto_udp.c
@@ -60,6 +60,7 @@
 	.listen = udp_bind_listener,
 	.enable = udp_enable_listener,
 	.disable = udp_disable_listener,
+	.unbind = default_unbind_listener,
 	.rx_enable = sock_enable,
 	.rx_disable = sock_disable,
 	.rx_unbind = sock_unbind,
@@ -83,6 +84,7 @@
 	.listen = udp_bind_listener,
 	.enable = udp_enable_listener,
 	.disable = udp_disable_listener,
+	.unbind = default_unbind_listener,
 	.rx_enable = sock_enable,
 	.rx_disable = sock_disable,
 	.rx_unbind = sock_unbind,
diff --git a/src/proto_uxst.c b/src/proto_uxst.c
index 7741586..04f12fa 100644
--- a/src/proto_uxst.c
+++ b/src/proto_uxst.c
@@ -59,6 +59,7 @@
 	.listen = uxst_bind_listener,
 	.enable = uxst_enable_listener,
 	.disable = uxst_disable_listener,
+	.unbind = default_unbind_listener,
 	.rx_enable = sock_enable,
 	.rx_disable = sock_disable,
 	.rx_unbind = sock_unbind,