diff --git a/lib/client-handshake.c b/lib/client-handshake.c
index f583501fa..de306a672 100644
--- a/lib/client-handshake.c
+++ b/lib/client-handshake.c
@@ -166,7 +166,7 @@ libwebsocket_client_connect(struct libwebsocket_context *context,
 	bzero(&server_addr.sin_zero, 8);
 
 	/* Disable Nagle */
-	setsockopt(wsi->sock, SOL_TCP, TCP_NODELAY, &opt, sizeof(opt));
+	setsockopt(wsi->sock, IPPROTO_TCP, TCP_NODELAY, &opt, sizeof(opt));
 
 	if (connect(wsi->sock, (struct sockaddr *)&server_addr,
 					      sizeof(struct sockaddr)) == -1)  {
diff --git a/lib/libwebsockets.c b/lib/libwebsockets.c
index 1f024a68d..05f7a40a0 100644
--- a/lib/libwebsockets.c
+++ b/lib/libwebsockets.c
@@ -725,7 +725,8 @@ libwebsocket_service_fd(struct libwebsocket_context *context,
 
 		/* Disable Nagle */
 		opt = 1;
-		setsockopt(accept_fd, SOL_TCP, TCP_NODELAY, &opt, sizeof(opt));
+		setsockopt(accept_fd, IPPROTO_TCP, TCP_NODELAY, &opt,
+				sizeof(opt));
 
 		if (context->fds_count >= MAX_CLIENTS) {
 			fprintf(stderr, "too busy to accept new client\n");
@@ -2445,7 +2446,7 @@ libwebsocket_create_context(int port, const char *interf,
 
 		/* Disable Nagle */
 		opt = 1;
-		setsockopt(sockfd, SOL_TCP, TCP_NODELAY, &opt, sizeof(opt));
+		setsockopt(sockfd, IPPROTO_TCP, TCP_NODELAY, &opt, sizeof(opt));
 
 		bzero((char *) &serv_addr, sizeof(serv_addr));
 		serv_addr.sin_family = AF_INET;