diff --git a/gui-wm/miracle-wm/Manifest b/gui-wm/miracle-wm/Manifest
index f76a759093..35ae8ed626 100644
--- a/gui-wm/miracle-wm/Manifest
+++ b/gui-wm/miracle-wm/Manifest
@@ -1 +1,2 @@
 DIST miracle-wm-0.3.4.tar.gz 440480 BLAKE2B 77f38c821950a0dc9ba143290616b4127c9b4fb72c69a8b6c672124da928d1c19e97508dd197d16f1ff480a3b4c735ed087980725d0dc46ec8702745cfb25b1a SHA512 780b1689301d0dd9af17c1c91a30ecedcfb915fc78ea4ccafdd573538f79baf6714edbb1dece67715be52bbe3fb0372bd49d3c895229ff23af3f2bac4a30b418
+DIST miracle-wm-0.3.5.tar.gz 453789 BLAKE2B 2f5e160e31df5a28722ba2c43f525ac150cceca57e759ddb3da3ee133eeb77a7436887d36784759db9b8398c6d189f4b0ef0cf393dc30d2cc86dc526d64810c8 SHA512 644868c534628623948c961c3d0ee84f41c51c19d759bdf9f04957a5b73126750f98da154785dd25bc20089c04f41d30e7283a5f2a14b00ffdaf69da5ef9d4b9
diff --git a/gui-wm/miracle-wm/metadata.xml b/gui-wm/miracle-wm/metadata.xml
index 4d5a42734f..08413345f7 100644
--- a/gui-wm/miracle-wm/metadata.xml
+++ b/gui-wm/miracle-wm/metadata.xml
@@ -6,6 +6,6 @@
 		<name>Takuya Wakazono</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="github">miracle-window-manager/miracle-wm</remote-id>
+		<remote-id type="github">miracle-wm-org/miracle-wm</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/gui-wm/miracle-wm/miracle-wm-0.3.5.ebuild b/gui-wm/miracle-wm/miracle-wm-0.3.5.ebuild
new file mode 100644
index 0000000000..6918bafc49
--- /dev/null
+++ b/gui-wm/miracle-wm/miracle-wm-0.3.5.ebuild
@@ -0,0 +1,55 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake systemd
+
+DESCRIPTION="Tiling Wayland compositor based on Mir"
+HOMEPAGE="https://github.com/miracle-wm-org/miracle-wm"
+SRC_URI="https://github.com/miracle-wm-org/miracle-wm/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+ MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="systemd test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-cpp/yaml-cpp:=
+	dev-cpp/nlohmann_json
+	dev-libs/glib:2
+	dev-libs/json-c:=
+	dev-libs/libevdev
+	gui-libs/mir
+	dev-libs/libpcre2:=
+	media-libs/libglvnd
+	x11-base/xwayland
+	x11-libs/libnotify
+"
+DEPEND="
+	${RDEPEND}
+	media-libs/glm
+"
+BDEPEND="
+	virtual/pkgconfig
+	test? ( dev-cpp/gtest )
+"
+
+src_prepare() {
+	cmake_src_prepare
+	use test || cmake_comment_add_subdirectory tests/
+
+	sed -i "s| /usr/lib/systemd/user| $(systemd_get_userunitdir)|" CMakeLists.txt || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DSYSTEMD_INTEGRATION=$(usex systemd)
+	)
+	cmake_src_configure
+}
+
+src_test() {
+	"${BUILD_DIR}/bin/miracle-wm-tests" || die
+}