diff --git a/dev-util/0xtools/0xtools-2.0.3-r1.ebuild b/dev-util/0xtools/0xtools-2.0.3-r2.ebuild
similarity index 88%
rename from dev-util/0xtools/0xtools-2.0.3-r1.ebuild
rename to dev-util/0xtools/0xtools-2.0.3-r2.ebuild
index 395a7ccf798ad..e6903af81533a 100644
--- a/dev-util/0xtools/0xtools-2.0.3-r1.ebuild
+++ b/dev-util/0xtools/0xtools-2.0.3-r2.ebuild
@@ -52,7 +52,7 @@ src_install() {
 
 	# C executables and scripts
 	exeinto /usr/bin
-	doexe bin/{cpumhz,vmtop,xcapture,xtop}
+	doexe bin/{cpumhz,vmtop,xcapture}
 	doexe bin/{run_xcapture.sh,run_xcpu.sh}
 
 	# Python executables
@@ -73,6 +73,10 @@ src_install() {
 	doins bin/xcapture-bpf.c
 	make_wrapper xcapture-bpf "/lib/${PN}/xcapture/xcapture-bpf"
 
+	# There is a upstream command "xtop" that wraps around "xcapture-bpf"
+	# but its broken because of dynamic path lookup for "xcapture-bpf".
+	make_wrapper xtop "xcapture-bpf --xtop --clear-screen"
+
 	# Service config
 	insinto /etc/default
 	newins xcapture.default xcapture