diff --git a/www-apps/code-server-bin/Manifest b/www-apps/code-server-bin/Manifest
index 99f5c6c7d7..6d4a66b6ab 100644
--- a/www-apps/code-server-bin/Manifest
+++ b/www-apps/code-server-bin/Manifest
@@ -1,2 +1,4 @@
 DIST code-server-3.4.1-linux-amd64.tar.gz 74127655 BLAKE2B 95e916e64c886688b370407ba932624a70b024cae64a57e7eb77f31c6a352138313fbced149adf2ee698d925b9e2a818823b25931a42a01d5e2eaedb082bbf1d SHA512 efd55c84fda96f22bec79b54f60d02a8d098f41cef77549c805c125eb845efae43d3f4703908f0542a78146eda67ebd9787f89b1c14b1b8044fdfd534f2b9173
 DIST code-server-3.4.1-linux-arm64.tar.gz 73470946 BLAKE2B 278a1fef95b612242f4126eea53d7b8dc824fc5dda55ff6b2f1e7752d3ebecebcf30045c1c2bb2a18d1ad7999b20c29398a3c5715920d6e8d8c94eaa76e8a619 SHA512 24168006e737a6579869b8e4b157e21d9ef85282b811783163f0d2291e47bee7e0794c8327663182922b473ff57999432e6c53502849836a53d300728341d1bc
+DIST code-server-3.6.1-linux-amd64.tar.gz 76288261 BLAKE2B 443135065cdab9e0477d9665e9e56d924bd9199ce19cfbdea1e811c2517e7e71beaf18a347a287d0013d7df655900fc08a8f7fcbfe402b1e22487a80876d1eaa SHA512 0e875dc78a2776897a5a1556183808da70c8a0b2e4d96653a419bdab08df6f3d10643f90f568edeafcb38c36bfefa9fe0a674ad020b5e08c17b2e0eece940bc1
+DIST code-server-3.6.1-linux-arm64.tar.gz 75331263 BLAKE2B c390e11b02472409ef0147f6dc5392f36eff93dd19a07e2eeed09a2626b541740c0191fdac0cca43e843b3195fc803921bf37b704b67a2e41fa0a531feca560c SHA512 badc150af52263232240edc16e960ac9e51b22e05bc96d81d11726e28d733b1d79139b0d85aa108011f2993c6a6e395134d2524e5fc13fe3b7dfeac24899eb75
diff --git a/www-apps/code-server-bin/code-server-bin-3.4.1.ebuild b/www-apps/code-server-bin/code-server-bin-3.4.1.ebuild
index 7446e32f40..d3bdc55e9a 100644
--- a/www-apps/code-server-bin/code-server-bin-3.4.1.ebuild
+++ b/www-apps/code-server-bin/code-server-bin-3.4.1.ebuild
@@ -5,8 +5,7 @@ EAPI=7
 
 MY_PN="${PN/-bin/}"
 MY_PV="${MY_PN}-${PV}"
-
-BASE_URI="https://github.com/cdr/${MY_PN}/releases/download/${PV}/${MY_PV}-linux"
+BASE_URI="https://github.com/cdr/${MY_PN}/releases/download/v${PV}/${MY_PV}-linux"
 
 inherit systemd
 
@@ -20,7 +19,6 @@ SRC_URI="
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~arm64"
-IUSE=""
 
 # In case we ever make a non-"-binary" pkg
 DEPEND="
diff --git a/www-apps/code-server-bin/code-server-bin-3.6.1.ebuild b/www-apps/code-server-bin/code-server-bin-3.6.1.ebuild
new file mode 100644
index 0000000000..d3bdc55e9a
--- /dev/null
+++ b/www-apps/code-server-bin/code-server-bin-3.6.1.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN="${PN/-bin/}"
+MY_PV="${MY_PN}-${PV}"
+BASE_URI="https://github.com/cdr/${MY_PN}/releases/download/v${PV}/${MY_PV}-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 )
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~arm64"
+
+# In case we ever make a non-"-binary" pkg
+DEPEND="
+	!www-apps/code-server
+"
+RDEPEND="
+	${DEPEND}
+	>=net-libs/nodejs-12.16.1[ssl]
+	sys-apps/ripgrep
+"
+
+S="${WORKDIR}/${MY_PV}-linux-${ARCH}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-node.patch"
+)
+
+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 || die
+	rm lib/node || die
+
+	# remove bundled ripgrep binary
+	rm lib/vscode/node_modules/vscode-ripgrep/bin/rg || die
+
+	# not needed
+	rm code-server || die
+	rm postinstall.sh || die
+	# already in /usr/portage/licenses/MIT
+	rm LICENSE.txt || die
+}
+
+src_install() {
+	local mydocs="README.md ThirdPartyNotices.txt"
+	for doc in ${mydocs}
+	do
+		(dodoc "${doc}" && rm "${doc}") || die
+	done
+
+	insinto "/usr/lib/${MY_PN}"
+	doins -r .
+	fperms +x "${EPREFIX}/usr/lib/${MY_PN}/bin/${MY_PN}"
+	dosym "${EPREFIX}/usr/lib/${MY_PN}/bin/${MY_PN}" "${EPREFIX}/usr/bin/${MY_PN}"
+
+	dosym "${EPREFIX}/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'"
+}