diff --git a/sys-boot/rpi-imager/Manifest b/sys-boot/rpi-imager/Manifest
index b4129ff..70e9805 100644
--- a/sys-boot/rpi-imager/Manifest
+++ b/sys-boot/rpi-imager/Manifest
@@ -1 +1,2 @@
 DIST rpi-imager-1.7.3.tar.gz 20213201 BLAKE2B 72ab2c8388a11fd7ad6e442872ed5fd31c9d8ec5b2a66143a8ff45fd2db86a260e4cda7039db0af60a45e32512a3370f79190d9cebd25c4abb587e23a42fe445 SHA512 e169c2662c9fbd409a40c97b1a31bebf8b292812266e427d2979aef1af00d29217efc011227b2067fab5c1287441ba4609723dde2c1e1dd3741a9f3851eeba92
+DIST rpi-imager-1.8.5.tar.gz 22455707 BLAKE2B a3268674a9d8345c23b765beef041404185eb31a25cefc2adee0d6de7910aa526c1b1f0073e4fd959ae3aa04764c9890355835295dab40149d07e37b0869a890 SHA512 574d4310234344be7502ecb6e01802f658455bc329a8080c88173c020c3e291478f5145b45c9ed68136ff1dafbaf8b842de2f8f086888cab806e931660f1d3b8
diff --git a/sys-boot/rpi-imager/rpi-imager-1.8.5.ebuild b/sys-boot/rpi-imager/rpi-imager-1.8.5.ebuild
new file mode 100644
index 0000000..05f800c
--- /dev/null
+++ b/sys-boot/rpi-imager/rpi-imager-1.8.5.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit cmake optfeature python-any-r1 xdg
+
+DESCRIPTION="Raspberry Pi Imaging Utility"
+HOMEPAGE="https://github.com/raspberrypi/rpi-imager"
+
+if [[ "${PV}" == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/raspberrypi/rpi-imager.git"
+else
+	SRC_URI="https://github.com/raspberrypi/rpi-imager/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="qt6 +filter-drivelist test"
+RESTRICT="test !test? ( test )" # requires network and extra permissions to write
+
+RDEPEND="
+	app-arch/libarchive:=
+	app-arch/xz-utils
+	net-libs/gnutls:=
+	net-misc/curl
+	!qt6? (
+		dev-qt/qtcore:5
+		dev-qt/qtdbus:5
+		dev-qt/qtdeclarative:5
+		dev-qt/qtgui:5
+		dev-qt/qtnetwork:5
+		dev-qt/qtwidgets:5
+	)
+	qt6? (
+		dev-qt/qtbase:6[dbus,gui,network,widgets]
+		dev-qt/qtdeclarative:6
+	)
+"
+DEPEND="
+	${RDEPEND}
+	!qt6? (
+		dev-qt/qtsvg:5
+	)
+	qt6? (
+		dev-qt/qtsvg:6
+	)
+"
+BDEPEND="
+	!qt6? ( dev-qt/linguist-tools )
+	test? (
+		${PYTHON_DEPS}
+		$(python_gen_any_dep '
+			dev-python/jsonschema[${PYTHON_USEDEP}]
+			dev-python/pytest[${PYTHON_USEDEP}]
+			dev-python/urllib3[${PYTHON_USEDEP}]
+		')
+	)
+"
+
+PATCHES=(
+	#https://github.com/raspberrypi/rpi-imager/pull/816
+	"${FILESDIR}/rpi-imager-1.8.5-expose-DRIVELIST_FILTER_SYSTEM_DRIVES.patch"
+)
+
+CMAKE_USE_DIR="${S}/src"
+
+python_check_deps() {
+	python_has_version "dev-python/jsonschema[${PYTHON_USEDEP}]" \
+		&& python_has_version "dev-python/pytest[${PYTHON_USEDEP}]" \
+		&& python_has_version "dev-python/urllib3[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_CHECK_VERSION=OFF
+		-DENABLE_TELEMETRY=OFF
+		-DDRIVELIST_FILTER_SYSTEM_DRIVES=$(usex filter-drivelist)
+		$(cmake_use_find_package !qt6 Qt5)
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	epytest tests
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	optfeature "writing to disk as non-root user" sys-fs/udisks:2
+}