diff --git a/net/iwnet/Makefile b/net/iwnet/Makefile
index b16a0ea17c25..373f7345cb8e 100644
--- a/net/iwnet/Makefile
+++ b/net/iwnet/Makefile
@@ -1,28 +1,34 @@
 # Created by: Alexey Dokuchaev <danfe@FreeBSD.org>
 
 PORTNAME=	iwnet
 PORTVERSION=	g20220223
 CATEGORIES=	net www
 
 MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	Asynchronous HTTP library with websockets, SSL, routing
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${LOCALBASE}/include/iowow/iowow.h:databases/iowow
 
 USES=		cmake compiler:c11
 USE_GITHUB=	yes
 GH_ACCOUNT=	Softmotions
 GH_TAGNAME=	0569ab0
 USE_LDCONFIG=	yes
 
 CMAKE_ARGS=	-DBUILD_SHARED_LIBS:BOOL=ON -DBUILD_TESTS:BOOL=ON
 
 OPTIONS_DEFINE=	DOCS
 
+post-patch:
+	@${REINPLACE_CMD} -e '/USES_TERMINAL/d' \
+		${WRKSRC}/tools/CMakeLists.txt
+	@${REINPLACE_CMD} -e '51s:malloc(:calloc(1, :' \
+		${WRKSRC}/tools/mimegen.c
+
 do-test:
 	@cd ${TEST_WRKSRC} && ctest -C ${CMAKE_BUILD_TYPE} ${_MAKE_JOBS}
 
 .include <bsd.port.mk>
diff --git a/net/iwnet/files/patch-src_CMakeLists.txt b/net/iwnet/files/patch-src_CMakeLists.txt
index dce86d7fd320..32642169582c 100644
--- a/net/iwnet/files/patch-src_CMakeLists.txt
+++ b/net/iwnet/files/patch-src_CMakeLists.txt
@@ -1,25 +1,25 @@
 --- src/CMakeLists.txt.orig	2022-02-23 09:48:00 UTC
 +++ src/CMakeLists.txt
 @@ -52,7 +52,7 @@ endif()
  set(CMAKE_C_FLAGS_DEBUG
      "${CMAKE_C_ASAN} -O0 -g -ggdb -Werror -DDEBUG -D_DEBUG -UNDEBUG -Wno-unused-variable"
  )
 -set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_ASAN} -O3 -DNDEBUG")
-+set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} ${CMAKE_C_ASAN} -DNDEBUG")
++set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_ASAN} -DNDEBUG")
  set(CMAKE_EXE_LINKER_FLAGS_RELEASE "-Wl,-s")
  set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELEASE} -g")
  set(CMAKE_C_FLAGS_RELEASEWITHDEBINFO ${CMAKE_C_FLAGS_RELWITHDEBINFO})
 @@ -174,13 +174,6 @@ if(BUILD_SHARED_LIBS)
                 SOVERSION ${PROJECT_VERSION_MAJOR}
                 PUBLIC_HEADER "${PUB_HDRS}"
                 DEFINE_SYMBOL IW_API_EXPORTS)
 -
 -  if(CMAKE_BUILD_TYPE STREQUAL "Release")
 -    add_custom_command(
 -      TARGET iwnet
 -      POST_BUILD
 -      COMMAND ${STRIP_CMD} $<TARGET_FILE:iwnet>)
 -  endif()
  
    set_target_properties(
      iwnet_s