diff --git a/net-libs/libwebsockets/libwebsockets-3.0.0.recipe b/net-libs/libwebsockets/libwebsockets-3.0.0.recipe
index 048ccf61f..557d42ed6 100644
--- a/net-libs/libwebsockets/libwebsockets-3.0.0.recipe
+++ b/net-libs/libwebsockets/libwebsockets-3.0.0.recipe
@@ -5,7 +5,7 @@ using a nonblocking event loop."
 HOMEPAGE="https://libwebsockets.org/"
 COPYRIGHT="2010-2018 Andy Green"
 LICENSE="GNU LGPL v2.1"
-REVISION="2"
+REVISION="3"
 SOURCE_URI="https://github.com/warmcat/libwebsockets/archive/v$portVersion.tar.gz"
 CHECKSUM_SHA256="a6b611c212c52f161f70556339fdaa199b7e9b6a167c4638e086d19db75d6290"
 SOURCE_FILENAME="libwebsockets-$portVersion.tar.gz"
@@ -51,13 +51,11 @@ BUILD_PREREQUIRES="
 
 BUILD()
 {
-	mkdir -p build && cd build
-
-	cmake \
+	cmake -Bbuild -S. -DCMAKE_BUILD_TYPE=release \
 		-DCMAKE_INSTALL_PREFIX="$prefix" \
-		-DCMAKE_BUILD_TYPE=release \
+		-DLIB_SUFFIX=$secondaryArchSubDir \
+		-DLWS_INSTALL_CMAKE_DIR="$libDir"/cmake/libwebsockets \
 		-DLWS_INSTALL_INCLUDE_DIR="$includeDir" \
-		-DLWS_INSTALL_LIB_DIR="$libDir" \
 		-DLWS_WITHOUT_EXTENSIONS=OFF \
 		-DLWS_WITHOUT_TESTAPPS=ON \
 		-DLWS_WITH_HTTP2=ON \
@@ -67,25 +65,21 @@ BUILD()
 		-DLWS_WITH_RANGES=ON \
 		-DLWS_WITH_ACME=ON \
 		-DLWS_WITH_SERVER_STATUS=ON \
-		..
-	make $jobArgs
+		-DLWS_WITH_STATIC=OFF
+	make -C build $jobArgs
 }
 
 INSTALL()
 {
-	cd build
-	make install
+	make -C build install
+
+	# remove pkgconfig file for static library
+	# this is disabled during build
+	rm -f $libDir/pkgconfig/libwebsockets_static.pc
 
 	prepareInstalledDevelLib libwebsockets
 	fixPkgconfig
 
-	# dirty hack until we find a better fix
-	if [ -n "$secondaryArchSuffix" ]; then
-		mkdir -p "$libDir"
-		mv "$prefix"/lib/cmake "$libDir"
-		mv "$prefix"/lib/pkgconfig "$developLibDir"
-	fi
-
 	packageEntries devel \
 		"$developDir" \
 		"$libDir"/cmake