diff --git a/www-client/qutebrowser/Manifest b/www-client/qutebrowser/Manifest
index 9271293625d0f..fd6637a76b28a 100644
--- a/www-client/qutebrowser/Manifest
+++ b/www-client/qutebrowser/Manifest
@@ -2,3 +2,5 @@ DIST qutebrowser-3.5.1.tar.gz 6074312 BLAKE2B 3d3002994573e0287f7adc473b1aa8e024
 DIST qutebrowser-3.5.1.tar.gz.asc 659 BLAKE2B fa8a56e4211e75726bf4466f8f84bf46aa975b9d4f1d47264e8b6c7ae67d46bb58bed768bf5db4f6e5148a32b9261cba7df9d7eb8c836f5115609787cdcaf18d SHA512 d40bd12ab0386dbdbc7ac83053324dd3f25f2578b02f0c75391ffbe419a79e1f0b0db84b77559abb7e05025211739e327bc513088815dd85e175d5d6da1a124f
 DIST qutebrowser-3.6.0.tar.gz 6090823 BLAKE2B 926bfc9ac9767375a0546d5bba9cebf19d1e49fb9247ca351c615bfb0769c4a973b2192dc9a63f93e849d287f5e413ca163c58665d5c3d3fc7a642e5a8d227f9 SHA512 805bf7b9b670913cb8a4a24615e78ce086193166cbce9acfa55e7708b05059263a405fc09777857d9d675d35c09a6e1ec69ebc4722b9f2879eda0553469dfded
 DIST qutebrowser-3.6.0.tar.gz.asc 659 BLAKE2B 823c16f8c58b93e43df6093a9f51e2d39c5cbe03e1a299d5628c232f0daea79bd9d5514920dbd98a0224ee1336a05e0210ea6bda19dfca5245caf4bb6e52b2af SHA512 9a55c8b7f95da28b4e4fed50e1b970bb13cc51bf79adc3b427843d26d68082fd2d2cee3e868c5e920647320667bf2e178369ef3bf3d305f5c553255b8e5e0b37
+DIST qutebrowser-3.6.1.tar.gz 6091194 BLAKE2B 682c70f9f6999ba13b5f179cbbb6606e4ee78b48194e4d05b25e268b5d4fa63dd944bbdabdf4b293adc35d6786fd510806aac63e4cf63c15ccb60b8eec0432e6 SHA512 765e36905ca4fec4151237421b194bc6948fa817d7e22ae7d5e254d7a1b2afd8e792b12e66fd05f78c44186fe08ae89dd5fb3e987c0a9dd540d4c80c11add184
+DIST qutebrowser-3.6.1.tar.gz.asc 659 BLAKE2B c31b9d246dea1c2cb543e46e7edafbae7eab7674d560da46ad8100fe8ac0dfc0bef543dfeeb60942db7e062f0cceb9f652dec01be5f13e3b2479e0b48b2b9873 SHA512 f09dba36e43cc1089800e5da78ce5880a124b996d057d94d3af6bc7e853c876b187e9a653992193bf7092e8cbf86c80b384375ae8c8e2803d44bb4d6ad468c3c
diff --git a/www-client/qutebrowser/qutebrowser-3.6.1.ebuild b/www-client/qutebrowser/qutebrowser-3.6.1.ebuild
new file mode 100644
index 0000000000000..fab8ca55b0776
--- /dev/null
+++ b/www-client/qutebrowser/qutebrowser-3.6.1.ebuild
@@ -0,0 +1,167 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{11..13} )
+inherit distutils-r1 xdg
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/qutebrowser/qutebrowser.git"
+else
+	inherit verify-sig
+	SRC_URI="
+		https://github.com/qutebrowser/qutebrowser/releases/download/v${PV}/${P}.tar.gz
+		verify-sig? ( https://github.com/qutebrowser/qutebrowser/releases/download/v${PV}/${P}.tar.gz.asc )
+	"
+	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/qutebrowser.gpg
+	KEYWORDS="~amd64 ~arm64"
+fi
+
+DESCRIPTION="Keyboard-driven, vim-like browser based on Python and Qt"
+HOMEPAGE="https://qutebrowser.org/"
+
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE="+adblock pdf widevine"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/pyqt6-webengine[${PYTHON_USEDEP},widgets]
+		dev-python/pyqt6[${PYTHON_USEDEP},dbus,gui,network,opengl,printsupport,qml,sql,widgets]
+		dev-python/colorama[${PYTHON_USEDEP}]
+		dev-python/jinja2[${PYTHON_USEDEP}]
+		dev-python/markupsafe[${PYTHON_USEDEP}]
+		dev-python/pygments[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/zipp[${PYTHON_USEDEP}]
+		dev-qt/qtbase:6[icu,sqlite]
+		adblock? ( dev-python/adblock[${PYTHON_USEDEP}] )
+		pdf? ( www-plugins/pdfjs )
+		widevine? ( www-plugins/chrome-binary-plugins )
+	')
+"
+BDEPEND="
+	$(python_gen_cond_dep '
+		test? (
+			dev-python/pyqt6[testlib]
+			dev-python/beautifulsoup4[${PYTHON_USEDEP}]
+			dev-python/cheroot[${PYTHON_USEDEP}]
+			dev-python/flask[${PYTHON_USEDEP}]
+			dev-python/pillow[${PYTHON_USEDEP}]
+			dev-python/tldextract[${PYTHON_USEDEP}]
+		)
+	')
+"
+
+if [[ ${PV} == 9999 ]]; then
+	BDEPEND+=" app-text/asciidoc"
+else
+	BDEPEND+=" verify-sig? ( >=sec-keys/openpgp-keys-qutebrowser-20251024 )"
+fi
+
+EPYTEST_PLUGINS=( hypothesis pytest-{bdd,mock,qt,rerunfailures,xvfb} )
+distutils_enable_tests pytest
+
+src_prepare() {
+	distutils-r1_src_prepare
+
+	if use pdf; then
+		# does not hurt to enable by default if it was explicitly requested
+		sed -e '/^content.pdfjs:/,+1s/false/true/' \
+			-i ${PN}/config/configdata.yml || die
+	fi
+
+	# let eclass handle python
+	sed -i '/setup.py/d' misc/Makefile || die
+
+	if [[ ${PV} == 9999 ]]; then
+		# call asciidoc(1) rather than the single target python module
+		sed -e '/cmdline = /s/= .*/= ["asciidoc"]/' \
+			-i scripts/asciidoc2html.py || die
+
+		"${EPYTHON}" scripts/asciidoc2html.py || die
+	fi
+
+	if use test; then
+		# skip unnecessary (for us) pytest plugins, and ignore Qt's
+		# warnings that tend to newly appear with new versions
+		sed -e '/pytest-benchmark/d' -e 's/--benchmark[^ ]*//' \
+			-e '/pytest-instafail/d' -e 's/--instafail//' \
+			-e '/qt_log_level_fail/s/WARNING/CRITICAL/' \
+			-i pytest.ini || die
+
+		if [[ ${PV} == 9999 ]]; then
+			# likewise, needs vulture
+			rm tests/unit/scripts/test_run_vulture.py || die
+		else
+			# https://github.com/qutebrowser/qutebrowser/issues/7620
+			rm tests/unit/scripts/test_problemmatchers.py || die
+		fi
+	fi
+}
+
+python_test() {
+	local -x PYTEST_QT_API=pyqt6
+
+	local EPYTEST_DESELECT=(
+		# end2end/IPC tests are broken with "Name error" if socket path is over
+		# ~108 characters (>124 in /var/tmp/portage) due to Linux limitations,
+		# skip rather than bother using /tmp+cleanup over ${T} (end2end tests
+		# are important, but the other tests should be enough for downstream)
+		tests/end2end
+		tests/unit/misc/test_ipc.py
+		# python eclasses provide a fake "failing" python2 and trips this test
+		tests/unit/misc/test_checkpyver.py::test_old_python
+		# not worth running dbus over
+		tests/unit/browser/test_notification.py::TestDBus
+		# fails in ebuild, seems due to saving fake downloads in the wrong location
+		tests/unit/browser/webengine/test_webenginedownloads.py::TestDataUrlWorkaround
+		# may fail if environment is very large (bug #819393)
+		tests/unit/commands/test_userscripts.py::test_custom_env\[_POSIXUserscriptRunner\]
+		# may fail if chromium version is unrecognized (aka newer qtwebengine)
+		tests/unit/utils/test_version.py
+		# no longer XFAIL due to being fixed in python
+		tests/unit/utils/test_urlmatch.py::test_invalid_patterns\[host-ipv6-two-closing\]
+	)
+
+	local epytestargs=(
+		# prefer pytest-xvfb over virtx given same upstream and is expected
+		-p xvfb
+		# skip warning tests broken by -Wdefault, and benchmarks
+		-k 'not _bench and not _matches_tree and not _warning'
+		# override eclass' settings, tempdirs are re-used by Qt
+		-o tmp_path_retention_policy=all
+	)
+
+	epytest "${epytestargs[@]}"
+}
+
+python_install_all() {
+	emake -f misc/Makefile DESTDIR="${D}" PREFIX="${EPREFIX}"/usr install
+
+	rm -- "${ED}"/usr/share/${PN}/scripts/{mkvenv,utils}.py || die
+	fperms -x /usr/share/${PN}/{scripts/cycle-inputs.js,userscripts/README.md}
+	python_fix_shebang "${ED}"/usr/share/${PN}
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	if [[ ! ${REPLACING_VERSIONS} ]]; then
+		elog "Note that optional scripts in ${EROOT}/usr/share/${PN}/{user,}scripts"
+		elog "have additional dependencies not covered by this ebuild, for example"
+		elog "view_in_mpv needs media-video/mpv[lua] and net-misc/yt-dlp."
+	fi
+
+	if has_version 'dev-qt/qtwebengine:6[bindist]'; then
+		ewarn
+		ewarn "USE=bindist is set on dev-qt/qtwebengine, be warned that this"
+		ewarn "will prevent playback of proprietary media formats (e.g. h264)."
+	fi
+}