diff --git a/app-admin/btrfs-assistant/Manifest b/app-admin/btrfs-assistant/Manifest
new file mode 100644
index 0000000000000..10dfce3334971
--- /dev/null
+++ b/app-admin/btrfs-assistant/Manifest
@@ -0,0 +1 @@
+DIST btrfs-assistant-2.1.1.tar.bz2 68416 BLAKE2B 3fa895c584ddb480a0e033c3fdb252fd7d25c7ae8743ae23b1ee67d33611fa47dca20cc76f55c05418a0542b00d042cb232a6572d9096efb51b3d31655396c60 SHA512 e90f6d2da09742557a5aae90435811f59d142f240818446cf1608bbfe40086064dcb721eca9432c8b66e498929f5b8c6e4de9e0c702921f443bce8a11aca7ea9
diff --git a/app-admin/btrfs-assistant/btrfs-assistant-2.1.1.ebuild b/app-admin/btrfs-assistant/btrfs-assistant-2.1.1.ebuild
new file mode 100644
index 0000000000000..4e9f1fbc5c452
--- /dev/null
+++ b/app-admin/btrfs-assistant/btrfs-assistant-2.1.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake xdg optfeature
+
+DESCRIPTION="GUI management tool to make managing a Btrfs filesystem easier"
+HOMEPAGE="https://gitlab.com/btrfs-assistant/btrfs-assistant"
+SRC_URI="https://gitlab.com/${PN}/${PN}/-/archive/${PV}/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="
+	dev-qt/qtbase:6[gui,widgets]
+	dev-qt/qtsvg:6
+	sys-fs/btrfs-progs
+"
+RDEPEND="${DEPEND}"
+BDEPEND="dev-qt/qttools:6[linguist]"
+
+src_prepare() {
+	cmake_src_prepare
+	sed -e 's/-Werror //' -i src/CMakeLists.txt || die
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	optfeature "auto snapshot" app-backup/snapper
+	optfeature "auto balance and defrag" sys-fs/btrfsmaintenance
+}
diff --git a/app-admin/btrfs-assistant/metadata.xml b/app-admin/btrfs-assistant/metadata.xml
new file mode 100644
index 0000000000000..f892edc7dbc3b
--- /dev/null
+++ b/app-admin/btrfs-assistant/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>arthurzam@gentoo.org</email>
+		<name>Arthur Zamarin</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="gitlab">btrfs-assistant/btrfs-assistant</remote-id>
+		<changelog>https://gitlab.com/btrfs-assistant/btrfs-assistant/-/blob/main/changelog</changelog>
+	</upstream>
+</pkgmetadata>