diff --git a/gui-apps/noctalia-shell/Manifest b/gui-apps/noctalia-shell/Manifest
index fe0a7ce102..cdf10a1bc1 100644
--- a/gui-apps/noctalia-shell/Manifest
+++ b/gui-apps/noctalia-shell/Manifest
@@ -1,4 +1,5 @@
 DIST noctalia-shell-5.0.0_pre20260520.tar.gz 4130496 BLAKE2B e5263e23f0780fe7084a84dbf0015abc4e2aeace8217c93533599c6186219d01add23d072a9eff3dba12e72f102620affe63e3aa5c913cb95271e8123600f2dd SHA512 d55670f89f499894a72eef7887870bf21f1b8653fb07f667f07d9ed6094148b670433f0d4cea2e376043836f60e43e0ccf533d12261de75bc8f336594b52d97a
+DIST noctalia-shell-5.0.0_pre20260521.tar.gz 4157738 BLAKE2B 97e6b12535a4a1bc9c792b7855e88daaf5154e218ff6fbd4d692ac389d260d4a2e0f592e59f367c0f00c718a15669b1ebd5da893d1c635746e37406fb913a552 SHA512 6e5f0ba8f105a5bfd124f4c4e3c38aa779378e1ffab24759752659fd9be2f2f626a788bb6aab8b2d37944139c38228e096672885b9f9948a028386a96f7447ad
 DIST noctalia-v4.5.0.tar.gz 24973587 BLAKE2B 29ce48bfd2a57158fdd4ec667ff088b0e054192334cadedba322970ecb062e7a6e6807231d3f4873421867e3435b5d9bc0eaef40e52555ca7a18d9d524a9b859 SHA512 f417bd4c4832ecaa0b4890770b033b64c96f05cd0b25316f91a699823c20317330c805263257922018a0def6c67abf36becf85c1555dc7503368d3f8eabb9aba
 DIST noctalia-v4.7.4.tar.gz 25368911 BLAKE2B 7b6552412aaf12b7873cdeec1831e209ba1373324c7c2d38f5413845fd2ed5f670a0abc7ed5c633569f46f0e5c76b5759fd989af093c8f9ec07e632a00204488 SHA512 c5c5f7d799164e8e391543b4810df5b9c9eef71a2b3ff5ce9953a1008437baa16096fc9f6be556477cf9357aa49e3c9ea5ff97c233634be639e9ca5765637def
 DIST noctalia-v4.7.5.tar.gz 25369825 BLAKE2B a234b470a503f2c221f11dea92fb4e8f2ba28e3cea1d2a76a7853d4d61d3567d72d7083ae725a5e985334e5c91176b310fd4c968af7ad5f56995cb0f9a4e4c4e SHA512 d18ac49eb65968c7b6afc7730868eeb48d5fb341302a96c718d0ddd7d6fe6659d268f56b6e99ad5f40255544596f72816e9f467c4e9be6a84d6a3574f3fcfe50
diff --git a/gui-apps/noctalia-shell/noctalia-shell-5.0.0_pre20260521.ebuild b/gui-apps/noctalia-shell/noctalia-shell-5.0.0_pre20260521.ebuild
new file mode 100644
index 0000000000..ec9f5d6091
--- /dev/null
+++ b/gui-apps/noctalia-shell/noctalia-shell-5.0.0_pre20260521.ebuild
@@ -0,0 +1,52 @@
+# Copyright 2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson optfeature
+
+MY_COMMIT="d835e5456ff7d4ac371d5217f49864088c2e2123"
+
+DESCRIPTION="A lightweight Wayland shell and bar built directly on Wayland + OpenGL ES"
+HOMEPAGE="https://noctalia.dev/ https://github.com/noctalia-dev/noctalia-shell"
+
+SRC_URI="https://github.com/noctalia-dev/noctalia-shell/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${MY_COMMIT}"
+
+LICENSE="MIT"
+SLOT="0"
+
+DEPEND="
+	dev-libs/glib:2
+	dev-cpp/sdbus-c++
+	media-libs/fontconfig
+	media-libs/freetype
+	media-libs/libwebp
+	gnome-base/librsvg:2
+	media-video/pipewire
+	net-misc/curl
+	sys-libs/pam
+	x11-libs/cairo[glib]
+	x11-libs/pango
+	x11-libs/libxkbcommon
+	media-libs/mesa
+	virtual/opengl
+	dev-libs/wayland
+	sys-auth/polkit
+"
+
+RDEPEND="${DEPEND}"
+
+BDEPEND="
+	dev-libs/wayland
+	dev-libs/wayland-protocols
+	dev-util/wayland-scanner
+"
+
+DOCS=( README.md CREDITS.md example.toml )
+
+
+pkg_postinst() {
+	optfeature "external display brightness control" app-misc/ddcutil
+	optfeature "hardware-accelerated screen recording" media-video/gpu-screen-recorder
+}
diff --git a/gui-apps/noctalia-shell/noctalia-shell-5.0.0_pre99999999.ebuild b/gui-apps/noctalia-shell/noctalia-shell-5.0.0_pre99999999.ebuild
new file mode 100644
index 0000000000..4655951197
--- /dev/null
+++ b/gui-apps/noctalia-shell/noctalia-shell-5.0.0_pre99999999.ebuild
@@ -0,0 +1,50 @@
+# Copyright 2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson optfeature
+
+DESCRIPTION="A lightweight Wayland shell and bar built directly on Wayland + OpenGL ES"
+HOMEPAGE="https://noctalia.dev/ https://github.com/noctalia-dev/noctalia-shell"
+
+inherit git-r3
+EGIT_REPO_URI="https://github.com/noctalia-dev/noctalia-shell.git"
+EGIT_BRANCH="v5"
+
+LICENSE="MIT"
+SLOT="0"
+
+DEPEND="
+	dev-libs/glib:2
+	dev-cpp/sdbus-c++
+	media-libs/fontconfig
+	media-libs/freetype
+	media-libs/libwebp
+	gnome-base/librsvg:2
+	media-video/pipewire
+	net-misc/curl
+	sys-libs/pam
+	x11-libs/cairo[glib]
+	x11-libs/pango
+	x11-libs/libxkbcommon
+	media-libs/mesa
+	virtual/opengl
+	dev-libs/wayland
+	sys-auth/polkit
+"
+
+RDEPEND="${DEPEND}"
+
+BDEPEND="
+	dev-libs/wayland
+	dev-libs/wayland-protocols
+	dev-util/wayland-scanner
+"
+
+DOCS=( README.md CREDITS.md example.toml )
+
+pkg_postinst() {
+	optfeature "external display brightness control" app-misc/ddcutil
+	optfeature "hardware-accelerated screen recording" media-video/gpu-screen-recorder
+}