diff --git a/www-apps/code-server-bin/Manifest b/www-apps/code-server-bin/Manifest
index 7691c15993..2d18dba9e3 100644
--- a/www-apps/code-server-bin/Manifest
+++ b/www-apps/code-server-bin/Manifest
@@ -4,3 +4,5 @@ DIST code-server-3.9.1-linux-amd64.tar.gz 69783057 BLAKE2B 0008d5967cb9b58129e4a
 DIST code-server-3.9.1-linux-arm64.tar.gz 69101049 BLAKE2B 57f1b32f8b4385bb7c749d701ded90a7cb82ab1f6ceb052e589720221bd41a2620a63c9f88517de9962771c858d6aca12273c3e70fad56e3b247e2c5f6178375 SHA512 1e5629ec3f7ffe9279d89099ae5c111358e41e481eb2df659e45a7ad4b6c340ed5b59b9f818df8857cdfe2b4c2d509d193c6c5f1f15217e6b8aaa5b21a7af1f9
 DIST code-server-3.9.2-linux-amd64.tar.gz 72578049 BLAKE2B 3cfbba389c17c7e1a7978c5ae359532dd09a5b415cc302b3ff95739a31d3749e7a9c9627ceee11427db807cb3918c3016970d42084721d2867c3e5eb418ebdf8 SHA512 b6f493af264a772dd56393447b158e50578316ceb62593cb4e9838783bb0472a7933fc7c036b03c0daac1ebf1d160cf6262c41b83751fb39cf4748159c2b7c03
 DIST code-server-3.9.2-linux-arm64.tar.gz 71753560 BLAKE2B df5cc9bb91ea6529a64fb8ee572ae451a83f9b0b2b2ef1a27755c67b56fbb73f5cfc43ed3e3a15ad62d1d81f7c780912661b9cad4aa631eed4bb0bce46174ee5 SHA512 bf9863d3877ce692f2a9f1e129f25edb05e7323a49db6dfc0fbd3b5df153f6a0edecc7395c75acda81eb4fdae0ed2cfdffccc8c155785e2bd994ebb58b39462f
+DIST code-server-3.9.3-linux-amd64.tar.gz 73054713 BLAKE2B fc9424ab592e7f7aed6f4dfcb9d881585f3eaf8477100935a940c409044400f137a8bea5489dac6a35c232ea9c35c8210a2695fbec2c33eec0ec60dcaef5ab6f SHA512 f4c489bac2c73a075183f378a3fa65787f10bb9829502956fb8ded6869cf770fdcbf4f5df151d1f5aaf20e79db2188cb95b12b1ea875cc0863a12a295fd8b5a0
+DIST code-server-3.9.3-linux-arm64.tar.gz 71436268 BLAKE2B eb1ce6ec5da7d9c448c3c8105bd483c2fec92a46ca35975deefa9850c0bfd4d800cdcd686836ed75d05cda2af16023ca7ad2f3028fcdf3440d0be1a30a85fe0b SHA512 e1c0ec1fdebfa67fa372b54de97b8d1b71d912cf496cad5d41376a9770d977948672a048c26baaca81867d6050b04a4a0501ffd822121955b6e8fe279a704533
diff --git a/www-apps/code-server-bin/code-server-bin-3.9.3.ebuild b/www-apps/code-server-bin/code-server-bin-3.9.3.ebuild
new file mode 100644
index 0000000000..553092c685
--- /dev/null
+++ b/www-apps/code-server-bin/code-server-bin-3.9.3.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN="${PN/-bin/}"
+MY_P="${MY_PN}-${PV}"
+BASE_URI="https://github.com/cdr/${MY_PN}/releases/download/v${PV}/${MY_P}-linux"
+
+inherit systemd
+
+DESCRIPTION="VS Code in the browser (binary version with unbundled node and ripgrep)"
+HOMEPAGE="https://coder.com/"
+SRC_URI="
+	amd64? ( ${BASE_URI}-amd64.tar.gz )
+	arm64? ( ${BASE_URI}-arm64.tar.gz )
+"
+
+RESTRICT="test"
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~arm64"
+IUSE="gnome-keyring"
+
+# In case we ever make a non-"-binary" pkg
+DEPEND="
+	!www-apps/code-server
+"
+RDEPEND="
+	${DEPEND}
+	>=net-libs/nodejs-12.16.1:0/12[ssl]
+	sys-apps/ripgrep
+	gnome-keyring? (
+		app-crypt/libsecret
+	)
+"
+
+S="${WORKDIR}/${MY_P}-linux-${ARCH}"
+
+PATCHES=( "${FILESDIR}/${PN}-node.patch" )
+
+DOCS=( "README.md" "ThirdPartyNotices.txt" )
+
+QA_PREBUILT="
+	/usr/lib/code-server/lib/coder-cloud-agent
+	/usr/lib/code-server/lib/vscode/node_modules/*
+"
+QA_PRESTRIPPED="
+	/usr/lib/code-server/lib/coder-cloud-agent
+"
+
+src_prepare() {
+	default
+
+	# We remove as much precompiled code as we can,
+	# node modules not written in JS cannot be removed
+	# thus "-bin".
+
+	# use system node
+	rm ./node ./lib/node \
+		|| die "failed to remove bundled nodejs"
+
+	# remove bundled ripgrep binary
+	rm ./lib/vscode/node_modules/vscode-ripgrep/bin/rg \
+		|| die "failed to remove bundled ripgrep"
+
+	# not needed
+	rm ./code-server || die
+	rm ./postinstall.sh || die
+
+	# already in /usr/portage/licenses/MIT
+	rm ./LICENSE.txt || die
+}
+
+src_install() {
+	einstalldocs
+
+	insinto "/usr/lib/${MY_PN}"
+	doins -r .
+	fperms +x "/usr/lib/${MY_PN}/bin/${MY_PN}"
+	dosym "../../usr/lib/${MY_PN}/bin/${MY_PN}" "${EPREFIX}/usr/bin/${MY_PN}"
+
+	dosym "../../../../../../../../usr/bin/rg" "${EPREFIX}/usr/lib/${MY_PN}/lib/vscode/node_modules/vscode-ripgrep/bin/rg"
+
+	systemd_dounit "${FILESDIR}/${MY_PN}.service"
+}
+
+pkg_postinst() {
+	elog "When using code-server systemd service run it as a user"
+	elog "For example: 'systemctl --user enable --now code-server'"
+}