diff --git a/src/proto_tcp.c b/src/proto_tcp.c
index fe0fdca..a842e61 100644
--- a/src/proto_tcp.c
+++ b/src/proto_tcp.c
@@ -633,7 +633,7 @@
 		setsockopt(fd, SOL_SOCKET, SO_REUSEPORT, &one, sizeof(one));
 #endif
 
-	if (!ext && (listener->options & LI_O_FOREIGN)) {
+	if (!ext && (listener->rx.settings->options & RX_O_FOREIGN)) {
 		switch (listener->rx.addr.ss_family) {
 		case AF_INET:
 			if (!sock_inet4_make_foreign(fd)) {
@@ -736,10 +736,17 @@
 	}
 #endif
 #if defined(IPV6_V6ONLY)
-	if (!ext && listener->options & LI_O_V6ONLY)
-                setsockopt(fd, IPPROTO_IPV6, IPV6_V6ONLY, &one, sizeof(one));
-	else if (!ext && listener->options & LI_O_V4V6)
-                setsockopt(fd, IPPROTO_IPV6, IPV6_V6ONLY, &zero, sizeof(zero));
+	if (!ext && listener->rx.addr.ss_family == AF_INET6) {
+		/* Prepare to match the v6only option against what we really want. Note
+		 * that sadly the two options are not exclusive to each other and that
+		 * v6only is stronger than v4v6.
+		 */
+		if ((listener->rx.settings->options & RX_O_V6ONLY) ||
+		    (sock_inet6_v6only_default && !(listener->rx.settings->options & RX_O_V4V6)))
+			setsockopt(fd, IPPROTO_IPV6, IPV6_V6ONLY, &one, sizeof(one));
+		else
+			setsockopt(fd, IPPROTO_IPV6, IPV6_V6ONLY, &zero, sizeof(zero));
+	}
 #endif
 
 	if (!ext && bind(fd, (struct sockaddr *)&listener->rx.addr, listener->rx.proto->sock_addrlen) == -1) {