diff --git a/net-im/riot-desktop/Manifest b/net-im/riot-desktop/Manifest
index d12293904..6e46ebc5c 100644
--- a/net-im/riot-desktop/Manifest
+++ b/net-im/riot-desktop/Manifest
@@ -1,2 +1,4 @@
 DIST riot-desktop-1.6.2.tar.gz 401236 BLAKE2B 0df29f11778d85988b4368de974c2e3ce62b3dfdda4b0c063def27d6bad9ed01814fb85c195aedfc0133b5da34fb49ddb5935fd0ef7149f274f76fcb75056791 SHA512 9709a4704aaef0e670c734c17d2499cd3299cd6cfc3160cda2a9f88954823a47874d619442e25c4f4a35182174db939f95017977af62037471daeae7b61ee666
+DIST riot-desktop-1.6.3.tar.gz 401942 BLAKE2B d239df730f6d1c2d442510d4dcba7b0f1b15ae023a4ac1b9ca5ca53343c6ef621f61fd3f1d44e8e5c52ff0082db549d965a945ea52bdcf2e6a88d9d81898381f SHA512 2138b83cf164e15f7638d1295f536f481f6248740915b698b2c4bae8f6ee068f8acf02173246874b26c39b1e57eef7da9a448d133a34c1b89456dc2d5e937cd1
 DIST riot-web-1.6.2.tar.gz 1150424 BLAKE2B 47436ac75160338abe2c38991256fb4ee6587433d6635e36d761c2d01c35cbc8a9585756da1bd9681c9385828661e0b4d9eeb8fd49bf6b6d70329b1aa205b024 SHA512 0b6287f806f14b7408315d34935b7f7f5f36d23e3bf5870141747ec988c9f30acfc74281103369b7b2ee30709c4a89c998c7855a917fd0cedd455dd0156128ec
+DIST riot-web-1.6.3.tar.gz 1153991 BLAKE2B 120ec149eb36cf3d735b7407b620ac083eb6ef54f7cf3ddee37c31c7c75a861a167c62f7a21336ce231b969cb90d883dbfdc78e4285bfc4583ce095eb568ab3f SHA512 cdb0d33226e94c1f16a7aea71888d45d1f659cf91c1bea7582407eac742ce30aa78651c078394d596b94bec605d2c828645a1a88099a2098aab2703326086165
diff --git a/net-im/riot-desktop/riot-desktop-1.6.3.ebuild b/net-im/riot-desktop/riot-desktop-1.6.3.ebuild
new file mode 100644
index 000000000..5247f0347
--- /dev/null
+++ b/net-im/riot-desktop/riot-desktop-1.6.3.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="A glossy Matrix collaboration client for desktop"
+HOMEPAGE="https://riot.im"
+
+inherit unpacker xdg-utils
+
+SRC_URI="https://github.com/vector-im/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://github.com/vector-im/riot-web/archive/v${PV}.tar.gz -> riot-web-${PV}.tar.gz"
+KEYWORDS="amd64"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="+emoji"
+REQUIRED_USE=""
+
+RESTRICT="network-sandbox"
+
+RDEPEND="app-accessibility/at-spi2-atk:2
+	dev-db/sqlcipher
+	dev-libs/atk
+	dev-libs/expat
+	dev-libs/nspr
+	dev-libs/nss
+	>=net-libs/nodejs-12.14.0
+	net-print/cups
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:3
+	x11-libs/libxcb
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libXtst
+	x11-libs/libXScrnSaver
+	x11-libs/pango
+	emoji? ( media-fonts/noto-emoji )"
+DEPEND="${RDEPEND}"
+BDEPEND="sys-apps/yarn
+	virtual/rust"
+
+QA_PREBUILT="
+	/opt/Riot/chrome-sandbox
+	/opt/Riot/crashpad_handler
+	/opt/Riot/riot-desktop
+	/opt/Riot/libEGL.so
+	/opt/Riot/libGLESv2.so
+	/opt/Riot/libffmpeg.so
+	/opt/Riot/libvk_swiftshader.so
+	/opt/Riot/swiftshader/libEGL.so
+	/opt/Riot/swiftshader/libGLESv2.so"
+
+RIOT_WEB_S="${WORKDIR}/riot-web-${PV}"
+
+src_prepare() {
+	default
+	pushd "${RIOT_WEB_S}" >/dev/null || die
+	yarn install || die
+	cp config.sample.json config.json || die
+
+	popd || die
+	yarn install || die
+}
+
+src_compile() {
+	pushd "${RIOT_WEB_S}" >/dev/null || die
+	yarn build || die
+
+	popd || die
+	ln -s "${RIOT_WEB_S}"/webapp ./ || die
+	yarn build:native || die
+	yarn build || die
+}
+
+src_install() {
+	unpack dist/${PN}_${PV}_amd64.deb
+	tar -xvf data.tar.xz || die
+
+	./node_modules/asar/bin/asar.js p webapp opt/Riot/resources/webapp.asar || die
+	mv usr/share/doc/${PN} usr/share/doc/${PF} || die
+	gunzip usr/share/doc/${PF}/changelog.gz || die
+
+	insinto /
+	doins -r usr
+	doins -r opt
+	local f
+	for f in ${QA_PREBUILT}; do
+		fperms +x "${f}"
+	done
+	dosym ../../opt/Riot/${PN} /usr/bin/${PN}
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+
+	elog "Since upgrading Riot to Electron 8 it uses StatusNotifierItem"
+	elog "for displaying the tray icon."
+	elog "Some popular status bars do not support the new API."
+	elog
+	elog "If you have problems with showing the tray icon, consider installing"
+	elog "x11-misc/snixembed."
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}