diff --git a/sys-kernel/ugrd/Manifest b/sys-kernel/ugrd/Manifest
index 29ac9c24dc..f9ba367c2b 100644
--- a/sys-kernel/ugrd/Manifest
+++ b/sys-kernel/ugrd/Manifest
@@ -2,3 +2,4 @@ DIST ugrd-0.12.1.tar.gz 39929 BLAKE2B d4d2788c0d23907b87ea6c98607f3d36e25c895618
 DIST ugrd-0.19.1.tar.gz 44713 BLAKE2B e22d8c6df5cffb6c903badf6b45f693a319215791d2fae6d45e163a1a191823130b4a1bdb541a20760154796e16f5e6e0bb10ce47f4d5c59279a71f37bc53362 SHA512 56383aca3bd52a734ae35ae51aec0aa12d849484466d58832324dc441fed3e955085119ba44d3248948033167e163be5d747fa27c71c999e78e7fa6357853e25
 DIST ugrd-0.19.3.tar.gz 44629 BLAKE2B 4c319cfe745640ff7ced5eb161498b3cd6250434d7b56e909a74b1a133910039ec81a399d55f6408b5b33f88a94fb41a54dd18d97443d00e73730a36802b635f SHA512 4cedc043d3e7ac616d263e4d467d1b825a5c425f7682f1ab531a84dfd17c49f99398226fc9ee39044591dcbc6d3308d01f1ffa6734e552945d1096bf1bff2923
 DIST ugrd-0.20.0.tar.gz 44531 BLAKE2B 3b76149371fac2c5945ce6693c41afdb27cf51028e138388406587cc9911113ad3af1dc64ce97bcdfe47b1916bba26e84b986efd12a8af67e58e16150fe69249 SHA512 11276bb6230f99d23fd59c8322f51c2648938ec27132a1425a4c99c34bfecb326f27b287a3583fb7a86ef62094674069e86f31bf504ac4fa8e63f88c52b33609
+DIST ugrd-0.21.0.tar.gz 44075 BLAKE2B 035ad4ce042e1e83df62109c2eda19a7b0708f49cbf14fa7edcfca64a81da6e543ee4daf086fde0fd4d5acca041a5cf18c923ec057dc354ffd0a4e18abfb69b6 SHA512 77ad34639b7b997788e0f069af8b26e33a7c8d96bfbf26f3e445872bf7ea771b25cac051411583a8441212d855c3415fbaa6ed345e05714f8599d4b244d831f9
diff --git a/sys-kernel/ugrd/ugrd-0.21.0.ebuild b/sys-kernel/ugrd/ugrd-0.21.0.ebuild
new file mode 100644
index 0000000000..6c369fa202
--- /dev/null
+++ b/sys-kernel/ugrd/ugrd-0.21.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{11..12} )
+inherit distutils-r1 optfeature
+
+DESCRIPTION="Python based initramfs generator with TOML defintions"
+HOMEPAGE="https://github.com/desultory/ugrd"
+SRC_URI="https://github.com/desultory/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="app-misc/pax-utils"
+DEPEND=">=dev-python/zenlib-1.7.2[${PYTHON_USEDEP}]
+>=dev-python/pycpio-0.9.0[${PYTHON_USEDEP}]
+sys-apps/pciutils"
+
+src_install() {
+	# Call the distutils-r1_src_install function to install the package
+	distutils-r1_src_install
+	# Create the ugrd config directory
+	keepdir /etc/ugrd
+	# Install the example config into /etc/ugrd/config.toml
+	# Do not overwrite an existing config
+	insinto /etc/ugrd
+	newins examples/example.toml config.toml
+	# Create the kernel preinst.d directory if it doesn't exist
+	# Install the kernel preinst.d hook
+	keepdir /etc/kernel/preinst.d
+	exeinto /etc/kernel/preinst.d
+	doexe hooks/51-ugrd.install
+}
+
+pkg_postinst() {
+	optfeature "ugrd.crypto.cryptsetup support" sys-fs/cryptsetup
+	optfeature "ugrd.fs.btrfs support" sys-fs/btrfs-progs
+	optfeature "ugrd.crypto.gpg support" app-crypt/gnupg
+}