diff --git a/src/net/tcp.c b/src/net/tcp.c
index 1e1968a0a..7087203aa 100644
--- a/src/net/tcp.c
+++ b/src/net/tcp.c
@@ -1396,13 +1396,20 @@ static struct interface_descriptor tcp_xfer_desc =
  ***************************************************************************
  */
 
-/** TCP socket opener */
-struct socket_opener tcp_socket_opener __socket_opener = {
+/** TCP IPv4 socket opener */
+struct socket_opener tcp_ipv4_socket_opener __socket_opener = {
 	.semantics	= TCP_SOCK_STREAM,
 	.family		= AF_INET,
 	.open		= tcp_open,
 };
 
+/** TCP IPv6 socket opener */
+struct socket_opener tcp_ipv6_socket_opener __socket_opener = {
+	.semantics	= TCP_SOCK_STREAM,
+	.family		= AF_INET6,
+	.open		= tcp_open,
+};
+
 /** Linkage hack */
 int tcp_sock_stream = TCP_SOCK_STREAM;