diff --git a/kde-plasma/plasma-firewall/Manifest b/kde-plasma/plasma-firewall/Manifest
index ae3992fc28653..b44b61695b5ec 100644
--- a/kde-plasma/plasma-firewall/Manifest
+++ b/kde-plasma/plasma-firewall/Manifest
@@ -1,2 +1,3 @@
 DIST plasma-firewall-6.3.5.tar.xz 382388 BLAKE2B 8868eb466c9b476978e7d640b2d780d259feb2c562f61cf4aae8097074f55e25662fe1364bf65851a5aeed2db80960b11852eab6abf6e1d2159e7a65f4626f51 SHA512 78545fa56e46c7cce80f68c6f497282b6b47e7ffc50a9b2f2d1899ed4148fe636a7907ab56f01cf1b4eccf8517cfe662d82340f2acd445c1eb9dcf46437f6838
+DIST plasma-firewall-6.3.6.tar.xz 381556 BLAKE2B 04d7bc5e8439396c322da1d05848d0864a06f53819e9b92bb8d2cd764ae322ac44bea34621a0f920c3735264aafef2baf93e8eaf4b03ef08bb162e2c97d05daa SHA512 ff7e16f40197acdd11c90c4ebec590890107abe02530553785371dddf7c31db88d940fb81b059a37de0e08e0eb4147aef9fb5111ff08150a2b7c218d7b72b478
 DIST plasma-firewall-6.4.2.tar.xz 381872 BLAKE2B 3e429eba70fa0ab93bb73e810daf75b74613723d3d8e53efa15b7f6cf40e3308c946e76e504226dba40cdd1b2430a5ad5c069730df39638308ba6a6d2b11faec SHA512 4c2b68e67fe912c0d0bbd8efe6295b19bac1284a3f7686267f23beb48131d0f4de4283e195b02597d02d0f075f6ee736deb1c98da36cbfebaeca2418a841227c
diff --git a/kde-plasma/plasma-firewall/plasma-firewall-6.3.6.ebuild b/kde-plasma/plasma-firewall/plasma-firewall-6.3.6.ebuild
new file mode 100644
index 0000000000000..effc0e519cdcb
--- /dev/null
+++ b/kde-plasma/plasma-firewall/plasma-firewall-6.3.6.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_TEST="forceoptional"
+PYTHON_COMPAT=( python3_{10..13} )
+KFMIN=6.10.0
+QTMIN=6.8.1
+inherit ecm plasma.kde.org python-single-r1 xdg
+
+DESCRIPTION="Plasma frontend for Firewalld or UFW"
+HOMEPAGE="https://invent.kde.org/network/plasma-firewall"
+
+LICENSE="GPL-2+"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="firewalld +ufw"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE} || ( firewalld ufw )"
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,network,xml]
+	>=dev-qt/qtdeclarative-${QTMIN}:6
+	>=kde-frameworks/kauth-${KFMIN}:6
+	>=kde-frameworks/kcmutils-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+"
+RDEPEND="${DEPEND}
+	${PYTHON_DEPS}
+	firewalld? ( net-firewall/firewalld )
+	ufw? ( net-firewall/ufw )
+"
+BDEPEND=">=kde-frameworks/kcmutils-${KFMIN}:6"
+
+src_prepare() {
+	ecm_src_prepare
+	# this kind of cmake magic doesn't work for us at all.
+	sed -e "1 s:^.*$:\#\!/usr/bin/env ${EPYTHON}:" \
+		-i kcm/backends/ufw/helper/kcm_ufw_helper.py.cmake || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_FIREWALLD_BACKEND=$(usex firewalld)
+		-DBUILD_UFW_BACKEND=$(usex ufw)
+	)
+	ecm_src_configure
+}
+
+pkg_postinst () {
+	xdg_pkg_postinst
+
+	if ! has_version sys-apps/systemd; then
+		ewarn "${PN} is not functional without sys-apps/systemd at this point."
+		ewarn "See also: https://bugs.gentoo.org/778527"
+	fi
+}