diff --git a/sys-process/htop/htop-3.4.1-r1.ebuild b/sys-process/htop/htop-3.4.1-r2.ebuild
similarity index 95%
rename from sys-process/htop/htop-3.4.1-r1.ebuild
rename to sys-process/htop/htop-3.4.1-r2.ebuild
index 9a8cc7e85c255..acf81c3e6f56b 100644
--- a/sys-process/htop/htop-3.4.1-r1.ebuild
+++ b/sys-process/htop/htop-3.4.1-r2.ebuild
@@ -96,7 +96,8 @@ pkg_postinst() {
 	xdg_desktop_database_update
 	xdg_icon_cache_update
 
-	fcaps cap_sys_ptrace usr/bin/${PN}
+	# Non-caps mode is blank to avoid suid with USE="-filecaps" (bug 961054)
+	fcaps -m '' cap_sys_ptrace usr/bin/htop
 
 	optfeature "Viewing processes accessing certain files" sys-process/lsof
 }
diff --git a/sys-process/htop/htop-9999.ebuild b/sys-process/htop/htop-9999.ebuild
index 9a8cc7e85c255..acf81c3e6f56b 100644
--- a/sys-process/htop/htop-9999.ebuild
+++ b/sys-process/htop/htop-9999.ebuild
@@ -96,7 +96,8 @@ pkg_postinst() {
 	xdg_desktop_database_update
 	xdg_icon_cache_update
 
-	fcaps cap_sys_ptrace usr/bin/${PN}
+	# Non-caps mode is blank to avoid suid with USE="-filecaps" (bug 961054)
+	fcaps -m '' cap_sys_ptrace usr/bin/htop
 
 	optfeature "Viewing processes accessing certain files" sys-process/lsof
 }