diff --git a/app-emacs/shell-maker/Manifest b/app-emacs/shell-maker/Manifest
new file mode 100644
index 0000000000000..fae5ab6bddffd
--- /dev/null
+++ b/app-emacs/shell-maker/Manifest
@@ -0,0 +1 @@
+DIST shell-maker-0.89.1.gh.tar.gz 230317 BLAKE2B 570e72ab1412f782fc85dff4a0cd2cb04325d26dbf1be8e632094ebf10f73cc74ef073b9264694cbdef64090e40a578e76a4bfb52489c45ef3c4eb8d248f3b20 SHA512 698dd31218d90c0702a7f38ba7154ebad0ccd4018eecbf149f46781f7326e04b08564527add69438df9d76d67bad17a198f5f7d23a6b5816f455567d38f5d6da
diff --git a/app-emacs/shell-maker/metadata.xml b/app-emacs/shell-maker/metadata.xml
new file mode 100644
index 0000000000000..013634444eaf8
--- /dev/null
+++ b/app-emacs/shell-maker/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+  <maintainer type="project">
+    <email>gnu-emacs@gentoo.org</email>
+    <name>Gentoo GNU Emacs project</name>
+  </maintainer>
+  <upstream>
+    <bugs-to>https://github.com/xenodium/shell-maker/issues/</bugs-to>
+    <remote-id type="github">xenodium/shell-maker</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-emacs/shell-maker/shell-maker-0.89.1.ebuild b/app-emacs/shell-maker/shell-maker-0.89.1.ebuild
new file mode 100644
index 0000000000000..bb915ddf7c999
--- /dev/null
+++ b/app-emacs/shell-maker/shell-maker-0.89.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS="27.1"
+
+inherit elisp
+
+DESCRIPTION="Interaction mode for making comint shells for GNU Emacs"
+HOMEPAGE="https://github.com/xenodium/shell-maker/"
+
+if [[ "${PV}" == *9999* ]] ; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/xenodium/${PN}"
+else
+	SRC_URI="https://github.com/xenodium/${PN}/archive/refs/tags/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-3+"
+SLOT="0"
+
+DOCS=( CHANGELOG.md README.org )
+SITEFILE="50${PN}-gentoo.el"
+
+elisp-enable-tests ert tests \
+	-l shell-maker-history-tests.el -l markdown-overlays-images-tests.el
+
+src_compile() {
+	elisp_src_compile
+	elisp-make-autoload-file
+	elisp-make-site-file "${SITEFILE}"
+}