diff --git a/sys-process/htop/htop-2.3.1.recipe b/sys-process/htop/htop-2.3.1.recipe
deleted file mode 100644
index 3bf6b53a7..000000000
--- a/sys-process/htop/htop-2.3.1.recipe
+++ /dev/null
@@ -1,48 +0,0 @@
-SUMMARY="An interactive process viewer for Unix"
-DESCRIPTION="This is htop, an interactive process viewer for Unix systems. It \
-is a terminal UI application uses ncurses."
-HOMEPAGE="https://sourceforge.net/projects/htop.rivoreo.p/"
-COPYRIGHT="
-	2004-2018 Hisham Muhammad
-	2015-2023 Rivoreo"
-LICENSE="GNU GPL v2"
-REVISION="1"
-SOURCE_URI="https://sourceforge.net/projects/htop.rivoreo.p/files/htop-$portVersion-src.tar.bz2/download"
-SOURCE_FILENAME="htop-$portVersion-src.tar.bz2"
-CHECKSUM_SHA256="6853967ab4f95e3f6d9c5324287c220c789eb95fed3cd6e7a18bd40542bc5bc0"
-SOURCE_DIR=""
-
-ARCHITECTURES="?all !x86_gcc2"
-SECONDARY_ARCHITECTURES="x86"
-
-PROVIDES="
-	htop$secondaryArchSuffix = $portVersion
-	cmd:htop$secondaryArchSuffix = $portVersion
-	"
-REQUIRES="
-	haiku$secondaryArchSuffix
-	lib:libncursesw$secondaryArchSuffix
-	"
-
-BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel
-	devel:libncursesw$secondaryArchSuffix
-	"
-BUILD_PREREQUIRES="
-	cmd:aclocal
-	cmd:autoreconf
-	cmd:gcc$secondaryArchSuffix
-	cmd:make
-	"
-
-BUILD()
-{
-	autogen.sh
-	runConfigure ./configure
-	make $jobArgs
-}
-
-INSTALL()
-{
-	make install
-}
diff --git a/sys-process/htop_rivoreo/htop_rivoreo-2.3.1.recipe b/sys-process/htop_rivoreo/htop_rivoreo-2.3.1.recipe
new file mode 100644
index 000000000..d725c9812
--- /dev/null
+++ b/sys-process/htop_rivoreo/htop_rivoreo-2.3.1.recipe
@@ -0,0 +1,64 @@
+SUMMARY="An interactive process viewer for Unix (Rivoreo's htop fork)"
+DESCRIPTION="This is Rivoreo's fork of htop, an interactive process viewer for Unix systems. It \
+is a terminal UI application uses ncurses.
+
+This fork is based on https://github.com/hishamhm/htop/ (now archived), and has since diverged \
+from the \"official\" htop (https://github.com/htop-dev/htop/).
+
+Among new features, and many fixes related to *BSD and other OSes, it includes Haiku support!"
+HOMEPAGE="https://sourceforge.net/projects/htop.rivoreo.p/"
+COPYRIGHT="
+	2004-2018 Hisham Muhammad
+	2015-2023 Rivoreo"
+LICENSE="GNU GPL v2"
+REVISION="1"
+SOURCE_URI="https://sourceforge.net/projects/htop.rivoreo.p/files/htop-$portVersion-src.tar.bz2/download"
+SOURCE_FILENAME="htop-$portVersion-src.tar.bz2"
+CHECKSUM_SHA256="6853967ab4f95e3f6d9c5324287c220c789eb95fed3cd6e7a18bd40542bc5bc0"
+SOURCE_DIR=""
+
+ARCHITECTURES="all !x86_gcc2"
+SECONDARY_ARCHITECTURES="x86"
+
+commandBinDir=$binDir
+commandSuffix=$secondaryArchSuffix
+if [ "$targetArchitecture" = x86_gcc2 ]; then
+	commandSuffix=
+	commandBinDir=$prefix/bin
+fi
+
+PROVIDES="
+	htop_rivoreo$secondaryArchSuffix = $portVersion
+	cmd:htop$commandSuffix = $portVersion
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix
+	lib:libncursesw$secondaryArchSuffix
+	"
+
+CONFLICTS="
+	htop$secondaryArchSuffix
+	"
+
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
+	devel:libncursesw$secondaryArchSuffix
+	"
+BUILD_PREREQUIRES="
+	cmd:aclocal
+	cmd:autoreconf
+	cmd:gcc$secondaryArchSuffix
+	cmd:make
+	"
+
+BUILD()
+{
+	autogen.sh
+	runConfigure --omit-dirs binDir ./configure --bindir="$commandBinDir"
+	make $jobArgs
+}
+
+INSTALL()
+{
+	make install
+}