diff --git a/app-crypt/lxqt-wallet/lxqt-wallet-4.0.2.ebuild b/app-crypt/lxqt-wallet/lxqt-wallet-4.0.2.ebuild
index fa67211bf..44a9570da 100644
--- a/app-crypt/lxqt-wallet/lxqt-wallet-4.0.2.ebuild
+++ b/app-crypt/lxqt-wallet/lxqt-wallet-4.0.2.ebuild
@@ -37,7 +37,7 @@ src_configure() {
 }
 
 pkg_postinst() {
-	if has_version 'kde-frameworks/kwallet:6'; then
+	if use kwallet && has_version 'kde-frameworks/kwallet:6'; then
 		ewarn "This software does not support kwallet6 yet"
 	fi
 }
diff --git a/app-crypt/sirikali/Manifest b/app-crypt/sirikali/Manifest
index 816b352ed..91ac68f43 100644
--- a/app-crypt/sirikali/Manifest
+++ b/app-crypt/sirikali/Manifest
@@ -1 +1,2 @@
 DIST sirikali-1.8.2.gh.tar.gz 1940862 BLAKE2B a15628ff8e0134d7bfeaf71a29db55e0ed7a522e7a4f7fb757d522765098f24012b08eaecc5ff2d8ad547dde4dd566b9863b9c93865f883e5b9ef2bb0075647b SHA512 d5cf45251266a8d772d46eff409176d05c1218c9b2584df693a59a26f00826725cca2268d360525e3213fe2bda3bc9eda79accbbe51678efdb6e9a3368e96c06
+DIST sirikali-1.8.4.gh.tar.gz 1945048 BLAKE2B d6b23c6fad43a83270350feed4609193e3ff50ef21fa1d72b96b24caea9bec8b3937014c15f29cd51df4de73332d42a934437b4170ee48c85db7416c9d6b0143 SHA512 0bd24e6c541aef87457c6bf3432a52cfca59e36064bb6aa56b3ec673224a5eb61a5bfa22c8cb229dd247f09cc970acb4e72be11c32f3be0e6365cbfce2eb43c7
diff --git a/app-crypt/sirikali/sirikali-1.8.2-r1.ebuild b/app-crypt/sirikali/sirikali-1.8.4-r1.ebuild
similarity index 94%
rename from app-crypt/sirikali/sirikali-1.8.2-r1.ebuild
rename to app-crypt/sirikali/sirikali-1.8.4-r1.ebuild
index 3516431c9..f3d6c51fc 100644
--- a/app-crypt/sirikali/sirikali-1.8.2-r1.ebuild
+++ b/app-crypt/sirikali/sirikali-1.8.4-r1.ebuild
@@ -4,8 +4,10 @@
 EAPI=8
 
 CMAKE_BUILD_TYPE=RELEASE
-#CMAKE_MAKEFILE_GENERATOR=emake
+CMAKE_MAKEFILE_GENERATOR=emake
+CMAKE_IN_SOURCE_BUILD=1
 inherit cmake
+#inherit autotools
 
 DESCRIPTION="A Qt/C++ GUI front end to some encrypted filesystems and sshfs"
 HOMEPAGE="
diff --git a/app-crypt/sirikali/sirikali-1.8.4.ebuild b/app-crypt/sirikali/sirikali-1.8.4.ebuild
new file mode 100644
index 000000000..529fa74ac
--- /dev/null
+++ b/app-crypt/sirikali/sirikali-1.8.4.ebuild
@@ -0,0 +1,57 @@
+# Copyright 2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_BUILD_TYPE=RELEASE
+inherit cmake
+
+DESCRIPTION="A Qt/C++ GUI front end to some encrypted filesystems and sshfs"
+HOMEPAGE="
+	https://mhogomchungu.github.io/sirikali/
+	https://github.com/mhogomchungu/sirikali
+"
+SRC_URI="https://github.com/mhogomchungu/sirikali/archive/refs/tags/${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64"
+IUSE="debug +keyring kwallet +pwquality test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	dev-qt/qtbase:6[dbus,gui,network,widgets]
+	dev-libs/libgcrypt:0=
+	pwquality? ( dev-libs/libpwquality )
+"
+
+src_prepare() {
+
+	#NONETWORKSUPPORT is broken, see https://github.com/mhogomchungu/sirikali/issues/299
+	#sed -i '/HAS_NETWORK_SUPPORT/d' CMakeLists.txt || die "unable to sed"
+
+	# do not install compressed MAN files
+	sed -i 's/\.1\.gz/\.1/g' CMakeLists.txt
+	cd src
+	unpack ./sirikali.1.gz ./sirikali.pkexec.1.gz
+	cd ..
+
+	cmake_src_prepare
+	eapply_user
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_WITH_QT6=true
+		-DINTERNAL_LXQT_WALLET=true
+		-DNOSECRETSUPPORT=$(usex keyring false true)
+		-DNOKDESUPPORT=$(usex kwallet false true)
+	)
+	DCMAKE_BUILD_TYPE=$(usex debug RelWithDebInfo Release) cmake_src_configure
+}
+
+pkg_postinst() {
+	if has_version 'kde-frameworks/kwallet:6'; then
+		ewarn "This software does not support kwallet6 yet"
+	fi
+}