diff --git a/app-misc/far2l/Manifest b/app-misc/far2l/Manifest
index 4f3f5d728d..9259c1a9d6 100644
--- a/app-misc/far2l/Manifest
+++ b/app-misc/far2l/Manifest
@@ -1,2 +1,2 @@
-DIST v_2.6.3.tar.gz 6730071 BLAKE2B 09e629c4bc77a93acdbe92a455355cb09ef54eb025c824fbf829db093f6d5b5a9491023aec80b050667aeeca910dbe82183d542268b0f722c83aa81e3278ade8 SHA512 9d35cae6bbc55058b4926026f73d8f368d8c78669493a67ab0901a3b044b27db87297715d763116fd3460f3a76dc890dbede09e24c3eae8354ac005d8f1c8bd7
 DIST v_2.6.4.tar.gz 6854330 BLAKE2B 577de3d07a40822c88358d267fa4be8b9ff68e4928218002a9cd45c9d3edd2e1faecbd8dec11d54aeeb6c49f087b8aff8d0fb0e22ffcc5fb0152b0d27774dc03 SHA512 87dfdbcecc0617d200288f113a7a59ae3192c9ab3f0e39fa1dac4992cedc9fdce2bf2bdc317446d37a078581c2c7dd5d7cf4fcb65e1577fafeec91974eb08a59
+DIST v_2.6.5.tar.gz 8274199 BLAKE2B 9a154a94c1d3fc7aa9c088263740c7edaeee857bbdf11e7b5fbc041786b12e8a98ccb82f0507d2de7ad18e347fc18bdc600d48f410ee0b176050fe81373a3eac SHA512 b643acbfb416127a3bde1e40093416a2b11abae54b6f5147ce5524cf19af3dbd4c45bf19585cb2b03288cdf69d6fabfdbca8dc4caa76212c9ef76d7aa87211bd
diff --git a/app-misc/far2l/far2l-2.6.3_beta.ebuild b/app-misc/far2l/far2l-2.6.5_beta.ebuild
similarity index 76%
rename from app-misc/far2l/far2l-2.6.3_beta.ebuild
rename to app-misc/far2l/far2l-2.6.5_beta.ebuild
index aea5ff8c08..57f60ae066 100644
--- a/app-misc/far2l/far2l-2.6.3_beta.ebuild
+++ b/app-misc/far2l/far2l-2.6.5_beta.ebuild
@@ -3,7 +3,9 @@
 
 EAPI=8
 
-WX_GTK_VER="3.0-gtk3"
+PYTHON_COMPAT=( python3_{11..13} )
+
+WX_GTK_VER="3.2-gtk3"
 
 inherit cmake xdg wxwidgets
 
@@ -24,24 +26,25 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="+ssl sftp samba nfs webdav +archive +wxwidgets"
+IUSE="+archive +chardet +colorer nfs samba sftp +ssl webdav wxwidgets X"
 RESTRICT="mirror"
 
-BDEPEND="sys-devel/m4"
-
-RDEPEND="dev-libs/xerces-c
-	dev-libs/spdlog
-	app-i18n/uchardet
+RDEPEND="
 	wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER} )
-	ssl? ( dev-libs/openssl )
-	sftp? ( net-libs/libssh[sftp] )
-	samba? ( net-fs/samba )
-	nfs? ( net-fs/libnfs )
-	webdav? ( net-libs/neon )
+	X? (
+		x11-libs/libX11
+		x11-libs/libXi
+	)
 	archive? (
-		dev-libs/libpcre2
 		app-arch/libarchive
-	)"
+	)
+	chardet? ( app-i18n/uchardet )
+	colorer? ( dev-libs/libxml2 )
+	nfs? ( net-fs/libnfs )
+	samba? ( net-fs/samba )
+	sftp? ( net-libs/libssh[sftp] )
+	ssl? ( dev-libs/openssl )
+	webdav? ( net-libs/neon )"
 
 DEPEND="${RDEPEND}"
 
@@ -54,11 +57,11 @@ pkg_setup() {
 }
 
 src_prepare() {
-	sed -e "s:execute_process(COMMAND ln -sf \../../bin/far2l \${CMAKE_INSTALL_PREFIX}/lib/far2l/far2l_askpass)::"
+	sed -e "s:execute_process(COMMAND ln -sf \../../bin/far2l \${CMAKE_INSTALL_PREFIX}/lib/far2l/far2l_askpass)::" \
 		-i "${S}"/CMakeLists.txt || die
-	sed -e "s:execute_process(COMMAND ln -sf \../../bin/far2l \${CMAKE_INSTALL_PREFIX}/lib/far2l/far2l_sudoapp)::"
+	sed -e "s:execute_process(COMMAND ln -sf \../../bin/far2l \${CMAKE_INSTALL_PREFIX}/lib/far2l/far2l_sudoapp)::" \
 		-i "${S}"/CMakeLists.txt || die
-	sed -e "s:execute_process(COMMAND rm -f \${CMAKE_INSTALL_PREFIX}/lib/far2l/Plugins/.*::"
+	sed -e "s:execute_process(COMMAND rm -f \${CMAKE_INSTALL_PREFIX}/lib/far2l/Plugins/.*::" \
 		-i "${S}"/CMakeLists.txt || die
 	cmake_src_prepare
 }
@@ -66,12 +69,12 @@ src_prepare() {
 src_configure() {
 	local mycmakeargs=(
 		-DUSEWX="$(usex wxwidgets)"
+		-DUSEUCD=$"$(usex chardet)"
+		-DCOLORER="$(usex colorer)"
 #		FIXME: add python plugins support
-#		We need pcpp for this
 #		-DPYTHON="$(usex python)"
 		-DBUILD_SHARED_LIBS=OFF
 	)
-
 	cmake_src_configure
 }