diff --git a/app-admin/keepassxc/Manifest b/app-admin/keepassxc/Manifest
index 05b0f1af102a..5a0f7cb2c8eb 100644
--- a/app-admin/keepassxc/Manifest
+++ b/app-admin/keepassxc/Manifest
@@ -1,3 +1,4 @@
 DIST keepassxc-2.7.11.gh.tar.gz 13714269 BLAKE2B 0fffada2ae86e527e6a7b2c46fa524c9e395067b6011297e6a5261863e10bdbc6a855675e0206726f6433a700f227053a8be0dd63734ffeddb73897190f96f5c SHA512 e50ad1b841866aa6baa3f121a0ee03296e771eb750aabd779d6665bd02ae427f3eb83e219e475762f6da235fcf3cdb9d47f5466acb9400e924753e2a10f15476
+DIST keepassxc-2.8.0_pre20260504.tar.gz 13908020 BLAKE2B 739d25c24291c2daf833541c11447c9983c031926843976299a6a5e1d4be5a681e13aa551ffeecd03aa0d610d96275bba23f679be4ecd30b2d269ffda76143db SHA512 20fefe6d7363d80965c119f83afb8c73e4c9f2b7075b39f0501d6d42d7d1f35df0c8388b6aa4a3c8ed851f92472ec668aefd0d20de6a1dfc80e2a2e5858350fe
 DIST keepassxc-2.8.0_pre260316-qt6_patches-f93bfe5e036f9c0aafe78b08f189943ba31a9158.patch.gz 78156 BLAKE2B deca3b0e277f92a57a9fe2af43884d0b3ad32654f8165cd8e0ea0519d4c67c5b3a97355551525d02cc3b4f8434bd52d99b64fd453fd0d26791eec0c5430e921b SHA512 18d15497762fce5471653d8a10b1f46ab662802b90c91bdcae45eb4f88b304ce3741933544e23e3fd7f0a5af0230c6ad5e3cf1886f259a896636ead0c3b323b0
 DIST keepassxc-2.8.0_pre260316.tar.gz 13906699 BLAKE2B 967ab543379d40afa9e2bf24a85580a0a02892a7de4c4261bc7607ac0d4fc751e56e69d828df24e5d80f37a2d09dec8b65a5a28e40063ddc9dbd6484ee02ccea SHA512 c60b420f099af0cca8e5af4affd0fb13f75dc1d9b16f93afd2d62647d81707b4a5849451c7032b9f79f5834f6c107b5d372a2814fefe445005564f407b09e942
diff --git a/app-admin/keepassxc/keepassxc-2.8.0_pre20260504.ebuild b/app-admin/keepassxc/keepassxc-2.8.0_pre20260504.ebuild
new file mode 100644
index 000000000000..eadd7692ff4b
--- /dev/null
+++ b/app-admin/keepassxc/keepassxc-2.8.0_pre20260504.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake xdg
+
+DESCRIPTION="KeePassXC - KeePass Cross-platform Community Edition"
+HOMEPAGE="https://keepassxc.org"
+
+#
+# Development KeepassXC version with Qt6 support
+#
+# This version is based on the current upstream development branch:
+#
+# commit 7c7ca4575e7fe6c3412d3fffcd1d5ad580211a17 (HEAD -> develop, origin/develop, origin/HEAD)
+# Author: Sami Vänttinen <sami.vanttinen@varjolintu.fi>
+# Date:   Mon May 4 15:16:51 2026 +0300
+#
+
+GIT_HASH="7c7ca4575e7fe6c3412d3fffcd1d5ad580211a17"
+SRC_URI="https://github.com/keepassxreboot/keepassxc/archive/${GIT_HASH}.tar.gz -> ${P}.tar.gz"
+
+S="${WORKDIR}/${PN}-${GIT_HASH}"
+
+#  if [[ "${PV}" = *9999* ]] ; then
+#      inherit git-r3
+#
+#      EGIT_BRANCH="develop"
+#      EGIT_REPO_URI="https://github.com/keepassxreboot/${PN}"
+#  else
+#      if [[ "${PV}" == *_beta* ]] ; then
+#          SRC_URI="https://github.com/keepassxreboot/${PN}/archive/${PV/_/-}.tar.gz
+#              -> ${P}.gh.tar.gz"
+#          S="${WORKDIR}/${P/_/-}"
+#      else
+#          SRC_URI="https://github.com/keepassxreboot/${PN}/archive/${PV}.tar.gz
+#              -> ${P}.gh.tar.gz"
+#      fi
+#
+#      KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+#  fi
+
+# COPYING order
+LICENSE="|| ( GPL-2 GPL-3 ) BSD LGPL-2.1 MIT LGPL-2 CC0-1.0 Apache-2.0 GPL-2+ BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="X browser doc +keyring +network +ssh-agent test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	app-crypt/argon2:=
+	dev-libs/botan:3=
+	dev-libs/libusb:1
+	dev-libs/zxcvbn-c
+	dev-qt/qtbase:6
+	dev-qt/qtsvg:6
+	media-gfx/qrencode:=
+	sys-apps/pcsc-lite
+	sys-apps/keyutils
+	sys-libs/readline:0=
+	virtual/minizip:=
+	virtual/zlib:=
+	X? (
+		dev-qt/qtbase:6[X]
+		x11-libs/libXext
+		x11-libs/libX11
+		x11-libs/libXi
+		x11-libs/libXtst
+	)
+"
+DEPEND="
+	${RDEPEND}
+"
+BDEPEND="
+	dev-qt/qttools:6[linguist]
+	doc? (
+		dev-ruby/asciidoctor
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.8.0-cmake_minimum.patch"
+	"${FILESDIR}/${PN}-2.7.10-tests.patch"
+)
+
+src_prepare() {
+	if ! [[ "${PV}" =~ _beta|9999 ]]; then
+		echo "${PV}" > .version || die
+	fi
+
+	# Unbundle zxcvbn, bug 958062
+	rm -r ./src/thirdparty/zxcvbn || die
+
+	if has_version "<dev-libs/zxcvbn-c-2.6" ; then
+		eapply "${FILESDIR}"/${PN}-2.7.10-zxcvbn.patch
+	fi
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local -a mycmakeargs=(
+		# Gentoo users enable ccache via e.g. FEATURES=ccache or
+		# other means. We don't want the build system to enable it for us.
+		-DWITH_CCACHE="OFF"
+		-DWITH_GUI_TESTS="OFF"
+		-DKPXC_FEATURE_UPDATES="OFF"
+
+		-DWITH_TESTS="$(usex test)"
+		-DKPXC_FEATURE_BROWSER="$(usex browser)"
+		-DKPXC_FEATURE_DOCS="$(usex doc)"
+		-DKPXC_FEATURE_FDOSECRETS="$(usex keyring)"
+		-DKPXC_FEATURE_NETWORK="$(usex network)"
+		-DKPXC_FEATURE_SSHAGENT="$(usex ssh-agent)"
+		-DWITH_X11="$(usex X)"
+	)
+
+	if [[ "${PV}" == *_beta* ]] ; then
+		mycmakeargs+=(
+			-DOVERRIDE_VERSION="${PV/_/-}"
+		)
+	fi
+
+	cmake_src_configure
+}