diff --git a/kde-plasma/ksshaskpass/Manifest b/kde-plasma/ksshaskpass/Manifest
index a09294730bece..29cb892b01ad7 100644
--- a/kde-plasma/ksshaskpass/Manifest
+++ b/kde-plasma/ksshaskpass/Manifest
@@ -1,2 +1,3 @@
 DIST ksshaskpass-6.3.5.tar.xz 30980 BLAKE2B 424cea484476595ccab31af6c58c44659c66641c0adc4bf674dcf6499310c0336ecb03d8aa3a776f3505c77e1c1d112f67c3c41ddb9be2d0db9fb0cef5772f25 SHA512 be69967842e4af54d641c1e165499003a6eee0ea3a1a9117f5ae51d2f3b6d2e0dfa060eda497a446d8d12ba3142023c192a8a877cfd862573601935b0902ec84
+DIST ksshaskpass-6.3.6.tar.xz 30776 BLAKE2B b442135278c85e697f97272084d8c495aa186f63075da17b04ead4f22eeca5e2b518d8a3377d532c56d0a1d191e751aeb6b6162a2e9968b7c60f61d94246d668 SHA512 48cd5e5591c4c585af7e782b0de536c595e4a6d0d5ffd01b1b762ae930f1bd83258ee7a5eef7dcc37bb6903a94805520490a4db86ec1042fa6fc129ebbdb67e5
 DIST ksshaskpass-6.4.2.tar.xz 30792 BLAKE2B 66ccbb589442b399a4ad1d3fa5010c045ccde0d042a120d35692f9d23a8247b78edb281a2c72a6043083e0d319012094fb4ee7447373208e40e7762dc26956ca SHA512 93a03b3fd1fc6ee54ef9dd2acff18d8e9fb8b0785f9a9006785c8dad94a0288f650be97b2c7c8507b71160a1041a4f0953059425c213af0bc0646f590b77353a
diff --git a/kde-plasma/ksshaskpass/ksshaskpass-6.3.6.ebuild b/kde-plasma/ksshaskpass/ksshaskpass-6.3.6.ebuild
new file mode 100644
index 0000000000000..8c712b6bd2fa0
--- /dev/null
+++ b/kde-plasma/ksshaskpass/ksshaskpass-6.3.6.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KFMIN=6.10.0
+QTMIN=6.8.1
+inherit ecm plasma.kde.org xdg
+
+DESCRIPTION="Implementation of ssh-askpass with KDE Wallet integration"
+HOMEPAGE+=" https://invent.kde.org/plasma/ksshaskpass"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[widgets]
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kwallet-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+"
+RDEPEND="${DEPEND}"
+
+src_install() {
+	ecm_src_install
+
+	insinto /etc/xdg/plasma-workspace/env/
+	doins "${FILESDIR}/05-ksshaskpass.sh"
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	elog "In order to have ssh-agent start with Plasma 6,"
+	elog "edit /etc/xdg/plasma-workspace/env/10-agent-startup.sh"
+	elog "and uncomment the lines enabling ssh-agent."
+	elog
+	elog "If you do so, do not forget to uncomment the respective"
+	elog "lines in /etc/xdg/plasma-workspace/shutdown/10-agent-shutdown.sh"
+	elog "to properly kill the agent when the session ends."
+	elog
+	elog "${PN} has been installed as your default askpass application"
+	elog "for Plasma 6 sessions."
+	elog "If that's not desired, select the one you want to use in"
+	elog "/etc/xdg/plasma-workspace/env/05-ksshaskpass.sh"
+}