diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9076becb..b3ae8698 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -474,6 +474,7 @@ CHECK_INCLUDE_FILE(strings.h LWS_HAVE_STRINGS_H)
 CHECK_INCLUDE_FILE(string.h LWS_HAVE_STRING_H)
 CHECK_INCLUDE_FILE(sys/prctl.h LWS_HAVE_SYS_PRCTL_H)
 CHECK_INCLUDE_FILE(sys/socket.h LWS_HAVE_SYS_SOCKET_H)
+CHECK_INCLUDE_FILE(sys/sockio.h LWS_HAVE_SYS_SOCKIO_H)
 CHECK_INCLUDE_FILE(sys/stat.h LWS_HAVE_SYS_STAT_H)
 CHECK_INCLUDE_FILE(sys/types.h LWS_HAVE_SYS_TYPES_H)
 CHECK_INCLUDE_FILE(unistd.h LWS_HAVE_UNISTD_H)
diff --git a/README.build.md b/README.build.md
index 18dea7a2..50b802d3 100644
--- a/README.build.md
+++ b/README.build.md
@@ -100,6 +100,20 @@ compiled in, use
 	$ cmake .. -DCMAKE_BUILD_TYPE=DEBUG
 ```
 
+       **NOTE6**
+       To build on Solaris the linker needs to be informed to use lib socket
+       and libnsl, and only builds in 64bit mode.
+
+    ```bash
+	$ cmake .. -DCMAKE_C_FLAGS=-m64 -DCMAKE_EXE_LINKER_FLAGS="-lsocket -lnsl"
+    ```
+
+4. Finally you can build using the generated Makefile:
+
+    ```bash
+	$ make
+    ```
+
 @section cmq Quirk of cmake
 
 When changing cmake options, for some reason the only way to get it to see the
diff --git a/lws_config_private.h.in b/lws_config_private.h.in
index c58d8b67..8ad39a26 100644
--- a/lws_config_private.h.in
+++ b/lws_config_private.h.in
@@ -75,6 +75,9 @@
 /* Define to 1 if you have the <sys/socket.h> header file. */
 #cmakedefine LWS_HAVE_SYS_SOCKET_H
 
+/* Define to 1 if you have the <sys/sockio.h> header file. */
+#cmakedefine LWS_HAVE_SYS_SOCKIO_H
+
 /* Define to 1 if you have the <sys/stat.h> header file. */
 #cmakedefine LWS_HAVE_SYS_STAT_H