diff --git a/sysutils/fluent-bit/Makefile b/sysutils/fluent-bit/Makefile
index 9ede90a03bdb..db72ad50b9ee 100644
--- a/sysutils/fluent-bit/Makefile
+++ b/sysutils/fluent-bit/Makefile
@@ -1,56 +1,56 @@
 PORTNAME=	fluent-bit
 DISTVERSIONPREFIX=	v
-DISTVERSION=	2.0.9
+DISTVERSION=	2.0.10
 CATEGORIES=	sysutils
 
 MAINTAINER=	girgen@FreeBSD.org
 COMMENT=	Fast and lightweight data forwarder
 WWW=		https://fluentbit.io/
 
 LICENSE=	APACHE20
 
 BROKEN_mips=		fails to build: conflicting types for 'restrict'
 BROKEN_mips64=		fails to build: conflicting types for 'restrict'
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	fluent
 
 USES=		cmake:noninja gmake bison
 
 OPTIONS_DEFINE=		SSL PGSQL
 OPTIONS_DEFAULT=	SSL
 
 LIB_DEPENDS=		libyaml.so:textproc/libyaml
 LDFLAGS+=		-lexecinfo -L${LOCALBASE}/lib
 CMAKE_ARGS=		-DFLB_DEBUG=Off -DFLB_TRACE=Off -DFLB_LUAJIT=Off
 CFLAGS+=		-I${LOCALBASE}/include
 
 SSL_USES=		ssl
 SSL_CMAKE_ON=		-DFLB_TLS=On
 SSL_CMAKE_OFF=		-DFLB_TLS=Off
 
 EXAMPLES_CMAKE_ON=	-DFLB_EXAMPLES=On
 EXAMPLES_CMAKE_OFF=	-DFLB_EXAMPLES=Off
 
 PGSQL_USES=		pgsql
 PGSQL_CMAKE_ON=		-DFLB_OUT_PGSQL=On
 PGSQL_CMAKE_OFF=	-DFLB_OUT_PGSQL=Off
 
 USE_RC_SUBR=	${PORTNAME}
 
 .include <bsd.port.options.mk>
 
 .if ${ARCH:Mpowerpc64*} || ${ARCH:Mriscv64*}
 CMAKE_ARGS+=	-DFLB_LUAJIT:BOOL=OFF
 .elif ${ARCH} == powerpc
 LDFLAGS+=	-latomic
 USES+=		compiler:gcc-c++11-lib
 .else
 USES+=		compiler:c11
 .endif
 
 post-install:
 	${MV} ${STAGEDIR}${ETCDIR}/${PORTNAME}.conf ${STAGEDIR}${ETCDIR}/${PORTNAME}.conf.sample
 	${MV} ${STAGEDIR}${ETCDIR}/parsers.conf ${STAGEDIR}${ETCDIR}/parsers.conf.sample
 
 .include <bsd.port.mk>
diff --git a/sysutils/fluent-bit/distinfo b/sysutils/fluent-bit/distinfo
index 9c33dab6b03a..3687c1c1c2b6 100644
--- a/sysutils/fluent-bit/distinfo
+++ b/sysutils/fluent-bit/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1675688824
-SHA256 (fluent-fluent-bit-v2.0.9_GH0.tar.gz) = 393ad4a6ced48c327607653d610ef273843085a17b6e5c8013877abdf31e6945
-SIZE (fluent-fluent-bit-v2.0.9_GH0.tar.gz) = 22404154
+TIMESTAMP = 1679269163
+SHA256 (fluent-fluent-bit-v2.0.10_GH0.tar.gz) = aad5176cb4dcadacacd379ca43160074c6690012d37c4749536ac3b977d50495
+SIZE (fluent-fluent-bit-v2.0.10_GH0.tar.gz) = 22417199
diff --git a/sysutils/fluent-bit/files/nono-patch-cmake__headers.cmake b/sysutils/fluent-bit/files/nono-patch-cmake__headers.cmake
new file mode 100644
index 000000000000..8e769265818e
--- /dev/null
+++ b/sysutils/fluent-bit/files/nono-patch-cmake__headers.cmake
@@ -0,0 +1,13 @@
+--- cmake/headers.cmake.orig	2023-02-07 10:29:14.434376000 +0100
++++ cmake/headers.cmake	2023-02-07 10:29:49.032926000 +0100
+@@ -23,8 +23,8 @@
+   ${CMAKE_CURRENT_BINARY_DIR}/lib/chunkio/include
+ 
+   # LuaJIT
+-  ${FLB_PATH_ROOT_SOURCE}/${FLB_PATH_LIB_LUAJIT}/src
+-  ${CMAKE_CURRENT_BINARY_DIR}/lib/luajit-cmake
++#  ${FLB_PATH_ROOT_SOURCE}/${FLB_PATH_LIB_LUAJIT}/src
++#  ${CMAKE_CURRENT_BINARY_DIR}/lib/luajit-cmake
+ 
+   ${FLB_PATH_ROOT_SOURCE}/${FLB_PATH_LIB_MONKEY}/include
+   ${FLB_PATH_ROOT_SOURCE}/${FLB_PATH_LIB_MONKEY}/include/monkey
diff --git a/sysutils/fluent-bit/files/nono-patch-cmake__libraries.cmake b/sysutils/fluent-bit/files/nono-patch-cmake__libraries.cmake
new file mode 100644
index 000000000000..a8d9032aeabf
--- /dev/null
+++ b/sysutils/fluent-bit/files/nono-patch-cmake__libraries.cmake
@@ -0,0 +1,11 @@
+--- cmake/libraries.cmake.orig	2023-02-07 10:27:13.362305000 +0100
++++ cmake/libraries.cmake	2023-02-07 10:29:06.625482000 +0100
+@@ -9,7 +9,7 @@
+ set(FLB_PATH_LIB_MSGPACK     "lib/msgpack-c")
+ set(FLB_PATH_LIB_AVRO        "lib/avro")
+ set(FLB_PATH_LIB_CHUNKIO     "lib/chunkio")
+-set(FLB_PATH_LIB_LUAJIT      "lib/luajit-3065c9")
++# install from ports: set(FLB_PATH_LIB_LUAJIT      "lib/luajit-3065c9")
+ set(FLB_PATH_LIB_MONKEY      "lib/monkey")
+ set(FLB_PATH_LIB_JSMN        "lib/jsmn")
+ set(FLB_PATH_LIB_MBEDTLS     "lib/mbedtls-2.28.0")