diff --git a/app-editors/vscodium-bin/Manifest b/app-editors/vscodium-bin/Manifest
index cbf5b35cc2..5d1f6190e8 100644
--- a/app-editors/vscodium-bin/Manifest
+++ b/app-editors/vscodium-bin/Manifest
@@ -1,3 +1,2 @@
 DIST VSCodium-linux-arm64-1.52.1.tar.gz 99006948 BLAKE2B 933e5b283e011873b7da60a838e7778d8ff1cf69006e5bf370fdeba7aa6709c2b8ea427936d353c75c0331d1a78defb7c0983d73d59c71163cde6ca32cf1ac32 SHA512 e96c79b1176a07f6cbd1a1d30d4a4d0d66d519d854bc0aa0e24e9baa4b0f6fe959e12b4888330188210957763febc644601f958b635deaa7e900f55f0eb5550f
-DIST VSCodium-linux-armhf-1.52.1.tar.gz 85288104 BLAKE2B 3df56d4708f44e5029a9cfed05185957951ead696885f16e8d3da8587f812f9e088e37e2b355157989a0e272661f367a1bd2d70cfbc7953a1f07f166b7b8292d SHA512 ffd5b2b476896d4aed67ed0bd157ca14819f493534c9e15eba247998becb06042c6c0caa88ee2db7e76529da252dac57c43c86371430b57a5819ce392cdcdcb5
 DIST VSCodium-linux-x64-1.52.1.tar.gz 96026417 BLAKE2B 0d06ddef0de3af3d22de4757bd5b81742cdfb6605192c61374857fdacfd8df374adf180aaa1f31f0397ead97e7f668320125ef1f806c71689348ac4a3c8bab8d SHA512 9a60f6821e7a796eaca842817fd3853c8099d74418ccabeacabed01c4f7b46b49c52bb11a032c317c27e3cef7ef2c49d2cf967ca2d2d79013790994a6aa9159f
diff --git a/app-editors/vscodium-bin/metadata.xml b/app-editors/vscodium-bin/metadata.xml
index 2a0f0b7f8e..dfc5f23976 100644
--- a/app-editors/vscodium-bin/metadata.xml
+++ b/app-editors/vscodium-bin/metadata.xml
@@ -5,9 +5,23 @@
 		<email>rossbridger.cc@gmail.com</email>
 		<name>Ross Charles Campbell</name>
 	</maintainer>
-	<longdescription>
-This is not a fork. This is a repository of scripts to automatically
-build Microsoft's vscode repository into freely-licensed binaries with
-a community-driven default configuration.
+	<maintainer type="person">
+		<email>xgqt@protonmail.com</email>
+		<name>Maciej Barć</name>
+	</maintainer>
+	<use>
+		<flag name="libsecret">Enable libsecret support</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">VSCodium/vscodium</remote-id>
+	</upstream>
+	<longdescription lang="en">
+		Microsoft’s vscode source code is open source (MIT-licensed),
+		but the product available for download (Visual Studio Code)
+		is licensed under this not-FLOSS license
+		and contains telemetry/tracking.
+		The VSCodium project exists so that you don’t have to download+build
+		from source. These binaries are licensed under the MIT license.
+		Telemetry is disabled.
 	</longdescription>
 </pkgmetadata>
diff --git a/app-editors/vscodium-bin/vscodium-bin-1.52.1.ebuild b/app-editors/vscodium-bin/vscodium-bin-1.52.1.ebuild
index c18d9b7b2c..e05dd8ce1c 100644
--- a/app-editors/vscodium-bin/vscodium-bin-1.52.1.ebuild
+++ b/app-editors/vscodium-bin/vscodium-bin-1.52.1.ebuild
@@ -9,52 +9,58 @@ MY_PN="${PN/-bin}"
 
 DESCRIPTION="Free/Libre Open Source Software Binaries of VSCode"
 HOMEPAGE="https://vscodium.com"
-
 SRC_URI="
-	amd64? ( https://github.com/VSCodium/vscodium/releases/download/${PV}/VSCodium-linux-x64-${PV}.tar.gz )
-	arm? ( https://github.com/VSCodium/vscodium/releases/download/${PV}/VSCodium-linux-armhf-${PV}.tar.gz )
-	arm64? ( https://github.com/VSCodium/vscodium/releases/download/${PV}/VSCodium-linux-arm64-${PV}.tar.gz )"
-
-RESTRICT="strip bindist"
+	amd64? (
+		https://github.com/VSCodium/${MY_PN}/releases/download/${PV}/VSCodium-linux-x64-${PV}.tar.gz
+	)
+	arm64? (
+		https://github.com/VSCodium/${MY_PN}/releases/download/${PV}/VSCodium-linux-arm64-${PV}.tar.gz
+	)
+"
 
+RESTRICT="bindist strip test"
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~arm ~arm64"
+KEYWORDS="-* ~amd64 ~arm64"
+IUSE="libsecret"
 
 RDEPEND="
 	app-accessibility/at-spi2-atk
-	app-crypt/libsecret[crypt]
 	dev-libs/nss
 	media-libs/libpng:0/16
+	sys-apps/ripgrep
 	x11-libs/cairo
 	x11-libs/gtk+:3
-	x11-libs/libnotify
 	x11-libs/libXScrnSaver
 	x11-libs/libXtst
-	x11-libs/pango"
-
-QA_PRESTRIPPED="*"
-
-QA_PREBUILT="
-	opt/${MY_PN}/codium
-	opt/${MY_PN}/libEGL.so
-	opt/${MY_PN}/libffmpeg.so
-	opt/${MY_PN}/libGLESv2.so
-	opt/${MY_PN}/libvk_swiftshader.so
-	opt/${MY_PN}/libvulkan.so
-	opt/${MY_PN}/swiftshader/libEGL.so
-	opt/${MY_PN}/swiftshader/libGLESv2.so"
+	x11-libs/libnotify
+	x11-libs/pango
+	libsecret? ( app-crypt/libsecret[crypt]	)
+"
 
 S="${WORKDIR}"
 
+src_prepare() {
+	default
+
+	# Unbundle ripgrep
+	rm "resources/app/node_modules.asar.unpacked/vscode-ripgrep/bin/rg" || die
+}
+
 src_install() {
 	pax-mark m codium
 	insinto "/opt/${MY_PN}"
 	doins -r *
-	fperms +x /opt/${MY_PN}/{,bin/}codium
 	dosym "../../opt/${MY_PN}/bin/codium" "usr/bin/codium"
+
 	domenu "${FILESDIR}/codium.desktop"
 	domenu "${FILESDIR}/codium-url-handler.desktop"
+
+	fperms +x /opt/${MY_PN}/{,bin/}codium
+	fperms +x /opt/${MY_PN}/chrome-sandbox
+	fperms -R +x /opt/${MY_PN}/resources/app/out/vs/base/node
+
+	dosym "../../../../../../../usr/bin/rg" "${EPREFIX}/opt/${MY_PN}/resources/app/node_modules.asar.unpacked/vscode-ripgrep/bin/rg"
 	dodoc resources/app/LICENSE.txt resources/app/ThirdPartyNotices.txt
 	newicon resources/app/resources/linux/code.png ${MY_PN}.png
 }