diff --git a/dev-db/pg_activity/Manifest b/dev-db/pg_activity/Manifest
index 4b17cda8ea28a..aa67d576e9618 100644
--- a/dev-db/pg_activity/Manifest
+++ b/dev-db/pg_activity/Manifest
@@ -1 +1,2 @@
 DIST pg_activity-3.5.1.tar.gz 436863 BLAKE2B 8312b2145ba89b807fb5e4e76f8eb57ad1f33079735e1be4a6ef7614034bbfbbb428567e90d7b8a6bc16dd65af186a3f6742e09584cef6136a7f8b3763724806 SHA512 f44f1ca08a250e35c056441f11c19e3618fba82a36f367df211ceb5787983ff76d2637a155de80c998680f9c0f79d66fcb38873d1b04368e73b5a06e650789c5
+DIST pg_activity-3.6.1.tar.gz 440574 BLAKE2B 683aa5c228971c55217af0e393053b066fb7d0f29154923937e97c17e5cb162db2159cfce5b4e52adfcfbeef59782f639e4d0a9b929118d1afc69a0f0cd0bd1a SHA512 3032cbebf7c976dd0b18cdab271b7056ece4ab6a841c0fd725fb48f5e6576a90664e8857807b15355d17857fbf5c056c4b7a5bed1f219333a27b309948797c2c
diff --git a/dev-db/pg_activity/pg_activity-3.6.1.ebuild b/dev-db/pg_activity/pg_activity-3.6.1.ebuild
new file mode 100644
index 0000000000000..512762c82bae1
--- /dev/null
+++ b/dev-db/pg_activity/pg_activity-3.6.1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{11..13} )
+
+inherit distutils-r1
+
+DESCRIPTION="Realtime PostgreSQL database server monitoring tool"
+HOMEPAGE="https://github.com/dalibo/pg_activity"
+SRC_URI="https://github.com/dalibo/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64"
+SLOT="0"
+LICENSE="POSTGRESQL"
+
+RDEPEND="
+	dev-python/attrs[${PYTHON_USEDEP}]
+	dev-python/blessed[${PYTHON_USEDEP}]
+	dev-python/humanize[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	dev-python/attrs[${PYTHON_USEDEP}]
+	test? (
+		dev-python/psycopg:0[${PYTHON_USEDEP}]
+		dev-python/psycopg:2[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	# https://github.com/dalibo/pg_activity/issues/201
+	export COLUMNS="80"
+	epytest -k 'not test_ui.txt and not test_data.py and not test_cli_help.txt and not test_cli_help_py312.txt'
+}
+
+src_install() {
+	distutils-r1_src_install
+	doman docs/man/${PN}.1
+}