diff --git a/tools/tools/git/Makefile b/tools/tools/git/Makefile
index ee73ad178486..3d5d05e3ce61 100644
--- a/tools/tools/git/Makefile
+++ b/tools/tools/git/Makefile
@@ -1,5 +1,15 @@
 SCRIPTS=	git-arc.sh git-mfc
-BINDIR?=	/usr/local/bin
+PREFIX?=	/usr/local
+BINDIR=		${PREFIX}/bin
 MAN=		git-arc.1 git-mfc.1
 
+.if ${.MAKE.OS} == "FreeBSD"
+MANDIR?=	${PREFIX}/share/man/man
+.else
+# Work with vanilla bmake on alternate OSes, e.g., Linux, macOS, etc.
+MANDIR?=	${PREFIX}/share/man
+
+.include <scripts.mk>
+.endif
+
 .include <bsd.prog.mk>
diff --git a/tools/tools/git/git-arc.sh b/tools/tools/git/git-arc.sh
index efc29b92865d..537ac0f58d85 100755
--- a/tools/tools/git/git-arc.sh
+++ b/tools/tools/git/git-arc.sh
@@ -101,7 +101,7 @@ get_bool_config()
 #
 setup()
 {
-    [ -x "${ARC_CMD}" ] || err "arc is required, install devel/arcanist-lib"
+    [ -x "${ARC_CMD}" ] || err "arc is required, install devel/phorgeit-arcanist-lib"
     which jq >/dev/null 2>&1 || err "jq is required, install textproc/jq"
 
     if [ "$VERBOSE" ]; then
@@ -152,9 +152,7 @@ setup()
 # the devel/arcanist-port, which installs a symlink in ${LOCALBASE}/bin
 # but conflicts with the archivers/arc port.
 #
-: "${LOCALBASE:=$(sysctl -n user.localbase)}"
-: "${LOCALBASE:=/usr/local}"
-: "${ARC_CMD:=${LOCALBASE}/lib/php/arcanist/bin/arc}"
+: "${ARC_CMD:="$(command -v arc)"}"
 arc()
 {
     ${ARC_CMD} "$@"