diff --git a/lang/rizin/Makefile b/lang/rizin/Makefile
index 42e5aa793064..46053595cc6a 100644
--- a/lang/rizin/Makefile
+++ b/lang/rizin/Makefile
@@ -1,50 +1,50 @@
 PORTNAME=	rizin
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.6.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	lang security shells
 
 MAINTAINER=	arrowd@FreeBSD.org
 COMMENT=	UNIX-like reverse engineering framework and command-line toolset
 WWW=		https://rizin.re
 
 LICENSE=	LGPL3 GPLv3
 LICENSE_COMB=	multi
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 NOT_FOR_ARCHS=	armv6 armv7
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR}
 LIB_DEPENDS=	libcapstone.so:devel/capstone \
 		libmspack.so:archivers/libmspack \
 		libxxhash.so:devel/xxhash \
 		libtree-sitter.so:devel/tree-sitter \
 		liblz4.so:archivers/liblz4 \
 		libzip.so:archivers/libzip
 
 USES=		localbase meson pkgconfig python:build ssl
 
 MESON_ARGS=	-D use_sys_capstone=enabled \
 		-D use_sys_magic=enabled \
 		-D use_sys_libzip=enabled \
 		-D use_sys_zlib=enabled \
 		-D use_sys_lz4=enabled \
 		-D use_sys_lzma=enabled \
 		-D use_sys_xxhash=enabled \
 		-D use_sys_openssl=enabled \
 		-D use_sys_libmspack=enabled \
 		-D use_sys_tree_sitter=enabled \
 		-D enable_rz_test=false
 		# -D use_sys_libzstd=enabled \
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	rizinorg
 GH_TUPLE=	rizinorg:rz-libdemangle:3eb0ef8:libdemangle/subprojects/libdemangle \
 		rizinorg:tree-sitter-c:81d96d8:tree_sitter_c/subprojects/tree-sitter-c \
 		BLAKE3-team:BLAKE3:3f396d2:blake3/subprojects/blake3
 
 post-extract:
 	${CP} -r ${WRKSRC}/subprojects/packagefiles/blake3 ${WRKSRC}/subprojects
 	${CP} -r ${WRKSRC}/subprojects/packagefiles/tree-sitter-c ${WRKSRC}/subprojects
 
 .include <bsd.port.mk>
diff --git a/lang/rizin/files/patch-subprojects_rizin-shell-parser_src_parser.c b/lang/rizin/files/patch-subprojects_rizin-shell-parser_src_parser.c
new file mode 100644
index 000000000000..487cbf26a0d6
--- /dev/null
+++ b/lang/rizin/files/patch-subprojects_rizin-shell-parser_src_parser.c
@@ -0,0 +1,8 @@
+--- subprojects/rizin-shell-parser/src/parser.c.orig	2023-10-17 10:11:38 UTC
++++ subprojects/rizin-shell-parser/src/parser.c
+@@ -1,4 +1,4 @@
+-#include <tree_sitter/parser.h>
++#include "tree_sitter/parser.h"
+ 
+ #if defined(__GNUC__) || defined(__clang__)
+ #pragma GCC diagnostic push
diff --git a/lang/rizin/files/patch-subprojects_rizin-shell-parser_src_scanner.c b/lang/rizin/files/patch-subprojects_rizin-shell-parser_src_scanner.c
new file mode 100644
index 000000000000..27c0caed234d
--- /dev/null
+++ b/lang/rizin/files/patch-subprojects_rizin-shell-parser_src_scanner.c
@@ -0,0 +1,11 @@
+--- subprojects/rizin-shell-parser/src/scanner.c.orig	2023-10-17 10:11:38 UTC
++++ subprojects/rizin-shell-parser/src/scanner.c
+@@ -1,7 +1,7 @@
+ // SPDX-FileCopyrightText: 2020 ret2libc <sirmy15@gmail.com>
+ // SPDX-License-Identifier: LGPL-3.0-only
+ 
+-#include <tree_sitter/parser.h>
++#include "tree_sitter/parser.h"
+ #include <ctype.h>
+ #include <wctype.h>
+ #include <stdio.h>