diff --git a/app-misc/spicetify-cli/Manifest b/app-misc/spicetify-cli/Manifest
index c873756..659a86c 100644
--- a/app-misc/spicetify-cli/Manifest
+++ b/app-misc/spicetify-cli/Manifest
@@ -6,3 +6,5 @@ DIST spicetify-cli-2.20.2-deps.tar.xz 4836824 BLAKE2B 52b0ad55752e143d574b11ed5a
 DIST spicetify-cli-2.20.2.tar.gz 2036866 BLAKE2B 0da08a501936dd8485df797184541c56f83774e50e7e1291b1339ecf01647df207df7c92b3380bb18a45cc02f41fc3cc570a728b13ee78b30f3dc6d8db12cd22 SHA512 d74c8dc6af55f5a6103baec05925c789f47c55617945da002e2676c90210d5df4e567113431fe9f4f2735947169e4b84074023509949cb2048e018a39e8cf146
 DIST spicetify-cli-2.20.3-deps.tar.xz 4836072 BLAKE2B 19f5c340d786ad082a7fb25a53468873e96a1814245a5ab4b3ff4383cf353d0e5db95a9c3d68df4bc695373bf4ae30d312b39a24684e11f7481a6a00347da0a9 SHA512 9a66b4fd8fe4ef3889f686e8f8c9223314bd4ba79508962b8bde8739d8c1d816e429b22216b49868994bdeaa42cc559506d5d70490594ebaab3039b8c71184ab
 DIST spicetify-cli-2.20.3.tar.gz 2036885 BLAKE2B 25683ef8158f9b3d91da2d9393110020fa3b6141a531c94fc206ea6b5cf98d9dc19b349663159e12aa1fa0cde34e59a5c42bb5166a6e8e020bf204f2aa23a119 SHA512 c8915d5bd005cbe7e30bb3a0f4b2cbd623a164ffed7d86acc615f18402eeb20def3821a135e8e0fcac662eb8eb5bd42fe8e4f5faa47f485c29d1c7ae82eadcaf
+DIST spicetify-cli-2.21.0-deps.tar.xz 4962368 BLAKE2B cd0db15beb1cc7c6360eb2d2a52daa23e5e81573f5314e377910398cc83611ed65574ef14577482cbd9407bba14589442ac0529ff7c914843965fa46d2f30722 SHA512 0c921f34c9f6d72b84f77b0ccbd13a2924075a9e7eb0c04f78aee948f2a38f25951d3f3497be45bf50555b93729d8d64e4edf642d706fd60c2750a5d90c89022
+DIST spicetify-cli-2.21.0.tar.gz 2041001 BLAKE2B 73ec38aca48da8c2585347517e45ff9db0bedeaf15a3824af80096f0c02324476249fe2334375fa745a3606709688befacf9170c1b0cf7315ae40f761df7809a SHA512 e1160f37c95f682488e3b60d09658fc11930877681d4d9e153e73bc92dd140b5608d97d86f5ac1d1146aa0dfbd5fac71794067e216b1aab52d60764d65c88242
diff --git a/app-misc/spicetify-cli/spicetify-cli-2.21.0.ebuild b/app-misc/spicetify-cli/spicetify-cli-2.21.0.ebuild
new file mode 100644
index 0000000..10bd5ae
--- /dev/null
+++ b/app-misc/spicetify-cli/spicetify-cli-2.21.0.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module
+
+WHITELIST_VERSIONS=(
+	"~ 1.2.13"
+	"~ 1.2.11"
+	"~ 1.2.9"
+	"~ 1.2.8"
+)
+
+whitelist_versions() {
+	local version_spec version1 version2
+	local -a deps
+
+	SPOTIFY_VERSIONS=
+
+	# Iterate in reverse for elog
+	for ((index = $(( ${#WHITELIST_VERSIONS[@]} - 1 )); index >= 0; index--)); do
+		read -r version_spec version1 version2 <<< "${WHITELIST_VERSIONS[${index}]}"
+
+		case ${version_spec} in
+			"<>")
+				deps[$index]="( <=media-sound/spotify-${version2} >=media-sound/spotify-${version1} )"
+				SPOTIFY_VERSIONS+="${version1} -> ${version2}"
+				;;
+			"~")
+				deps[$index]="~media-sound/spotify-${version1}"
+				SPOTIFY_VERSIONS+="${version1}"
+				;;
+			*)
+				die "Invalid version specifier in WHITELIST_VERSIONS"
+				;;
+		esac
+
+		if [[ ${index} == 0 ]]; then
+			SPOTIFY_VERSIONS+=". "
+		elif [[ ${index} == 1 ]]; then
+			SPOTIFY_VERSIONS+=" and "
+		else
+			SPOTIFY_VERSIONS+=", "
+		fi
+	done
+
+	RDEPEND=" || ( ${deps[@]} )"
+}
+whitelist_versions
+
+DESCRIPTION="Commandline tool to customize Spotify client."
+HOMEPAGE="https://spicetify.app/"
+SRC_URI="
+	https://github.com/spicetify/spicetify-cli/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://gitlab.com/api/v4/projects/37881342/packages/generic/${PN}/${PV}/${P}-deps.tar.xz
+"
+
+LICENSE="Apache-2.0 BSD LGPL-2.1 MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+# no tests
+RESTRICT="test"
+
+INSTALLDIR="/opt/${PN}"
+
+src_compile() {
+	ego build -ldflags "-X main.version=${PV}"
+}
+
+src_install() {
+	insinto "${INSTALLDIR}"
+	doins -r {CustomApps,Extensions,Themes,jsHelper,spicetify-cli}
+	dobin "${FILESDIR}/spicetify"
+	fperms +x "${INSTALLDIR}/spicetify-cli"
+}
+
+pkg_postinst() {
+	elog "Spicetify requires a Spotify install that it can modify."
+	elog "To give read and write permissions to everyone on the system to run the following commands."
+	elog "# chmod a+wr /opt/spotify/spotify-client"
+	elog "# chmod a+wr /opt/spotify/spotify-client/Apps -R"
+	elog ""
+	elog "Spicetify compatibility is limited to the following Spotify versions:"
+	elog " ${SPOTIFY_VERSIONS}"
+	elog ""
+	elog "Otherwise you can install spotify to a user modifiable location like as a flatpak:"
+	elog " https://spicetify.app/docs/advanced-usage/installation#spotify-installed-from-flatpak"
+	elog ""
+	elog "To install themes see:"
+	elog " https://spicetify.app/docs/advanced-usage/themes"
+}