diff --git a/app-admin/bobby/Manifest b/app-admin/bobby/Manifest
new file mode 100644
index 00000000..9a015211
--- /dev/null
+++ b/app-admin/bobby/Manifest
@@ -0,0 +1 @@
+DIST bobby-0.1.0.tar.gz 30553 BLAKE2B 861be74af88a476da25f2241aa62859c04e526fe4d66b95416e0c5d5b786cbfebf60abf0a9b9163bd710d5bf7cadfea594075f5e226b1b88f89b00b9c515be65 SHA512 e9cec4a4e412f69cd0aa1eb768dfb1a4e61baa160f161c04b9db8e0d1a78b1a8c24e82f9308889ba28c491b2beecb7d34bcba4878ebc6b0930c179066dade0bc
diff --git a/app-admin/bobby/bobby-0.1.0.ebuild b/app-admin/bobby/bobby-0.1.0.ebuild
new file mode 100644
index 00000000..92ac3336
--- /dev/null
+++ b/app-admin/bobby/bobby-0.1.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9,10,11,12} )
+DISTUTILS_USE_PEP517=setuptools
+
+inherit distutils-r1
+
+DESCRIPTION="Interactive assistant for NVMe disk replacement and mdadm RAID management"
+HOMEPAGE="https://github.com/adjust/bobby"
+SRC_URI="https://github.com/adjust/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+RESTRICT="fetch"
+
+# Runtime tools bobby shells out to.
+# storcli (MegaSAS controller management) is proprietary and not in the tree;
+# install it manually from the vendor if using the hwctrl-migrate step.
+RDEPEND="
+	sys-fs/mdadm
+	sys-apps/nvme-cli
+	sys-apps/smartmontools
+	sys-block/parted
+	sys-apps/util-linux
+	sys-process/psmisc
+	sys-process/lsof
+"
+
+pkg_nofetch() {
+	einfo "The bobby source tarball must be downloaded manually."
+	einfo "Visit the repository and download the archive for v${PV}:"
+	einfo ""
+	einfo "  https://github.com/adjust/${PN}/archive/v${PV}.tar.gz"
+	einfo ""
+	einfo "Save the file as '${P}.tar.gz' and place it in your distfiles directory:"
+	einfo ""
+	einfo "  ${DISTDIR}/${P}.tar.gz"
+}
+
+#distutils_enable_tests pytest
diff --git a/app-admin/bobby/metadata.xml b/app-admin/bobby/metadata.xml
new file mode 100644
index 00000000..6817c9cd
--- /dev/null
+++ b/app-admin/bobby/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+		<maintainer type="person">
+				<email>ops@adjust.com</email>
+		</maintainer>
+	<longdescription lang="en">
+		Bobby the fixer - cli wizard to help with various hardware maintenances
+	</longdescription>
+</pkgmetadata>