diff --git a/.sai.json b/.sai.json
index ecbf52625..46a7d563f 100644
--- a/.sai.json
+++ b/.sai.json
@@ -82,13 +82,17 @@
 		},
 		"freebsd-12/x86_64-amd/llvm": {
 			"build":	"mkdir build destdir;cd build;export CCACHE_DISABLE=1;cmake .. ${cmake} && make -j12 && make -j12 DESTDIR=../destdir install"
-		}
+		},
+                "netbsd/aarch64BE-bcm2837-a53/gcc": {
+                        "build": "mkdir build destdir;cd build;export CCACHE_DISABLE=1;cmake .. ${cmake};make -j4 && make -j4 DESTDIR=../destdir install",
+                        "default": false
+                }
 	},
 
 	"configurations": {
 		"default": {
 			"cmake":	"",
-			"platforms":	"windows-10/x86_64-amd/msvc, windows-10/x86_64-amd/noptmsvc, freertos-linkit/arm32-m4-mt7697-usi/gcc, linux-ubuntu-2004/aarch64-a72-bcm2711-rpi4/gcc, windows-10/x86_64-amd/mingw32, windows-10/x86_64-amd/mingw64"
+			"platforms":	"windows-10/x86_64-amd/msvc, windows-10/x86_64-amd/noptmsvc, freertos-linkit/arm32-m4-mt7697-usi/gcc, linux-ubuntu-2004/aarch64-a72-bcm2711-rpi4/gcc, windows-10/x86_64-amd/mingw32, windows-10/x86_64-amd/mingw64, netbsd/aarch64BE-bcm2837-a53/gcc"
 		},
 		"esp32-heltec": {
 			"cmake":	"",
@@ -119,7 +123,7 @@
 		},
 		"default-examples": {
 			"cmake":	"-DLWS_WITH_MINIMAL_EXAMPLES=1",
-			"platforms":	"windows-10/x86_64-amd/msvc, windows-10/x86_64-amd/noptmsvc, linux-ubuntu-2004/aarch64-a72-bcm2711-rpi4/gcc"
+			"platforms":	"windows-10/x86_64-amd/msvc, windows-10/x86_64-amd/noptmsvc, linux-ubuntu-2004/aarch64-a72-bcm2711-rpi4/gcc, netbsd/aarch64BE-bcm2837-a53/gcc"
 		},
 		"h1only-examples": {
 			"cmake":	"cmake .. -DLWS_WITH_HTTP2=0 -DLWS_WITH_MINIMAL_EXAMPLES=1",
diff --git a/lib/plat/unix/unix-spawn.c b/lib/plat/unix/unix-spawn.c
index 44a783d9d..8277122a6 100644
--- a/lib/plat/unix/unix-spawn.c
+++ b/lib/plat/unix/unix-spawn.c
@@ -447,7 +447,7 @@ lws_spawn_piped(const struct lws_spawn_piped_info *i)
 	if (lsp->info.disable_ctrlc)
 		/* stops non-daemonized main processess getting SIGINT
 		 * from TTY */
-#if defined(__FreeBSD__)
+#if defined(__FreeBSD__) || defined(__NetBSD__)
 		setpgid(0, 0);
 #else
 		setpgrp();
diff --git a/lib/tls/CMakeLists.txt b/lib/tls/CMakeLists.txt
index 0c8b0e246..d12b56901 100644
--- a/lib/tls/CMakeLists.txt
+++ b/lib/tls/CMakeLists.txt
@@ -413,6 +413,16 @@ if (GENCERTS)
 			message("SUCCSESFULLY generated SSL certificate")
 		endif()
 	else()
+               if (CMAKE_HOST_SYSTEM_NAME MATCHES "NetBSD")
+                execute_process(
+                        COMMAND "${OPENSSL_EXECUTABLE}"
+                                req -new -newkey rsa:2048 -days 10000 -nodes -x509 -subj "/O=lws" -keyout "${TEST_SERVER_SSL_KEY}" -out "${TEST_SERVER_SSL_CERT}"
+                        RESULT_VARIABLE OPENSSL_RETURN_CODE
+                        #               OUTPUT_QUIET ERROR_QUIET
+                        )
+
+               else()
+	
 		# Unix.
 		execute_process(
 			COMMAND printf "GB\\nErewhon\\nAll around\\nlibwebsockets-test\\n\\nlocalhost\\nnone@invalid.org\\n"
@@ -421,6 +431,8 @@ if (GENCERTS)
 			RESULT_VARIABLE OPENSSL_RETURN_CODE
 			#		OUTPUT_QUIET ERROR_QUIET
 			)
+			
+		endif()
 
 		if (OPENSSL_RETURN_CODE)
 			message(WARNING "!!! Failed to generate SSL certificate for Test Server!!!:\nOpenSSL return code = ${OPENSSL_RETURN_CODE}")