diff --git a/kde-apps/kleopatra/Manifest b/kde-apps/kleopatra/Manifest
index 2777df25a90ed..b09345471f592 100644
--- a/kde-apps/kleopatra/Manifest
+++ b/kde-apps/kleopatra/Manifest
@@ -1,2 +1,3 @@
 DIST kleopatra-20.12.3.tar.xz 2001196 BLAKE2B 2bab317762becfff6f44d8fecd1ae25a9425c30b492ad201cf51e249d26bfc145bdb0dc06bb52b6511e131ffe9f26b9b1628b6915dd415d223786e950c533ee4 SHA512 8f27930714988d53622c0d8e5e5e3cd82e58eaf6582ed150f4a7326f61837c44fbb6dee2881934bdea1a0d8976b7173ef5d580154ccfeb84e75e3b0c38019433
 DIST kleopatra-21.04.1.tar.xz 2054160 BLAKE2B 990e01cd7cba0290d6d27f755a20c5ce738176e943e2e0eb8662733a6bff38dbee8cbd0b3b15053695dbf56279cbfde6517c0db81588c81929db1fff3a401083 SHA512 3ef8eacc18fac85ad35ca2faec943ff1c3831ee04433af50b3ad2c479192d6108ac25d89427b10f11a41cf5ba285b6afcd0d4875facb2940133895ac463be434
+DIST kleopatra-21.04.2.tar.xz 2115416 BLAKE2B 0827420f2347ac72a09aaf0631c7975ca0bbf29cc3d9b0ec47daef262610e8b5f1dd052a06f2851e59014a5a61fa12575a88942339b72d03c8045c9c5a2b45db SHA512 405a17a7e82c02944bd6ad96b4a941e9b890305769ccedb8442bfdce3116945170dee0c18f89237b4f70eec7dc547ab6be8d88a5a6bed5223a0d6cb0a21f15f6
diff --git a/kde-apps/kleopatra/kleopatra-21.04.2.ebuild b/kde-apps/kleopatra/kleopatra-21.04.2.ebuild
new file mode 100644
index 0000000000000..67ffb80aa5c3b
--- /dev/null
+++ b/kde-apps/kleopatra/kleopatra-21.04.2.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="optional"
+ECM_TEST="forceoptional"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.80.0
+QTMIN=5.15.2
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Certificate manager and GUI for OpenPGP and CMS cryptography"
+HOMEPAGE="https://apps.kde.org/kleopatra/"
+
+LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=app-crypt/gpgme-1.13.1[cxx,qt5]
+	dev-libs/boost:=
+	dev-libs/libassuan
+	dev-libs/libgpg-error
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtprintsupport-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-apps/kmime-${PVCUT}:5
+	>=kde-apps/libkleo-${PVCUT}:5
+	>=kde-frameworks/kcmutils-${KFMIN}:5
+	>=kde-frameworks/kcodecs-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kitemmodels-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/ktextwidgets-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+"
+RDEPEND="${DEPEND}
+	>=app-crypt/gnupg-2.1
+	app-crypt/paperkey
+"
+
+# tests completely broken, bug #641720
+RESTRICT+=" test"