diff --git a/devel/phabricator/Makefile b/devel/phabricator/Makefile
index 5ef16edf3e9a..5b3b51d62182 100644
--- a/devel/phabricator/Makefile
+++ b/devel/phabricator/Makefile
@@ -1,95 +1,95 @@
 PORTNAME=	phabricator
 PORTVERSION=	20201119
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel
 PKGNAMESUFFIX=	${PHP_PKGNAMESUFFIX}
 
 PATCH_SITES=	https://github.com/grembo/phabricator/commit/
 PATCHFILES=	0851b89eb6633dd792cd4eb10c26f86c2f0da56a.patch:-p1
 
 MAINTAINER=	grembo@FreeBSD.org
 COMMENT=	Open source, software engineering platform
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	arcanist-lib${PHP_PKGNAMESUFFIX}>=20210113_1:devel/arcanist-lib@${PHP_FLAVOR} \
 		git:devel/git
 
 USES=		cpe php:cli,flavors shebangfix
 CPE_VENDOR=	phacility
 
 SHEBANG_FILES=	resources/timezones/*.php \
 		scripts/*.php \
 		scripts/almanac/*.php \
 		scripts/cache/*.php \
 		scripts/celerity/*.php \
 		scripts/daemon/*.php \
 		scripts/daemon/exec/exec_daemon.php \
 		scripts/diviner/*.php \
 		scripts/drydock/*.php \
 		scripts/fact/*.php \
 		scripts/files/*.php \
 		scripts/install/install_rhel-derivs.sh \
 		scripts/install/install_ubuntu.sh \
 		scripts/lipsum/*.php \
 		scripts/mail/*.php \
 		scripts/repository/*.php \
 		scripts/search/*.php \
 		scripts/setup/*.php \
 		scripts/ssh/*.php \
 		scripts/sql/*.php \
 		scripts/ssh/*.php \
 		scripts/symbols/*.php \
 		scripts/util/*.php \
 		support/aphlict/server/*.php
 
 USE_PHP=	ctype curl fileinfo filter hash iconv mbstring mysqli openssl \
 		pcntl posix zip
 IGNORE_WITH_PHP=81
 
 OPTIONS_DEFINE=	GD OPCACHE
 OPTIONS_DEFAULT=GD OPCACHE
 OPCACHE_DESC?=	Use OPcache to improve performance
 
 GD_USE=		PHP=gd
 
 OPCACHE_RUN_DEPENDS=	${PHPBASE}/lib/php/${PHP_EXT_DIR}/apcu.so:devel/pecl-APCu@${PHP_FLAVOR}
 OPCACHE_USE=		PHP=opcache
 
 USE_GITHUB=	yes
 NO_BUILD=	yes
 NO_ARCH=	yes
 USE_RC_SUBR=	phd
 SUB_FILES=	pkg-message
 PORTSCOUT=	ignore:1
 GH_ACCOUNT=	phacility
 GH_TAGNAME=	b2ab18f
 
 PHP_DESTDIR=	lib/php/phabricator
 
 post-patch:
 	@${SED} 's|%%LOCALBASE%%|${LOCALBASE}|g' \
 		${FILESDIR}/phabricator-sudoers.sample > ${WRKSRC}/resources/sshd/phabricator-sudoers.sample
 	@${REINPLACE_CMD} \
 		's|/path/to/phabricator|${LOCALBASE}/lib/php/phabricator|g; \
 		 s|vcs-user|git|g' \
 		${WRKSRC}/resources/sshd/phabricator-ssh-hook.sh
 	@${REINPLACE_CMD} \
 		's|/usr/libexec/phabricator-ssh-hook.sh|${LOCALBASE}/lib/php/phabricator/resources/sshd/phabricator-ssh-hook.sh|; \
 		 s|vcs-user|git|g; \
 		 s|PrintLastLog no||g; \
 		 s|PidFile /var/run/sshd-phabricator.pid||g' \
 		${WRKSRC}/resources/sshd/sshd_config.phabricator.example
 	@${REINPLACE_CMD} \
 		's|%%PHP_CMD%%|${PREFIX}/bin/php|g' \
 		${WRKSRC}/scripts/celerity/install_merge.sh \
 		${WRKSRC}/src/infrastructure/testing/fixture/PhabricatorStorageFixtureScopeGuard.php
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${PHP_DESTDIR}/conf/local
 	${INSTALL_DATA} ${FILESDIR}/local.json.sample \
 		${STAGEDIR}${PREFIX}/${PHP_DESTDIR}/conf/local
 	cd ${WRKSRC} ; ${PAX} -rw * ${STAGEDIR}${PREFIX}/${PHP_DESTDIR}
 
 .include <bsd.port.mk>
diff --git a/devel/phabricator/files/patch-src_applications_project_controller_PhabricatorProjectViewController.php b/devel/phabricator/files/patch-src_applications_project_controller_PhabricatorProjectViewController.php
new file mode 100644
index 000000000000..72d4ec69e293
--- /dev/null
+++ b/devel/phabricator/files/patch-src_applications_project_controller_PhabricatorProjectViewController.php
@@ -0,0 +1,11 @@
+--- src/applications/project/controller/PhabricatorProjectViewController.php.orig	2022-01-26 14:24:00 UTC
++++ src/applications/project/controller/PhabricatorProjectViewController.php
+@@ -39,7 +39,7 @@ final class PhabricatorProjectViewController
+         $controller_object = new PhabricatorProjectManageController();
+         break;
+       default:
+-        return $engine->buildResponse();
++        return $engine->buildResponse(true);
+     }
+ 
+     return $this->delegateToController($controller_object);
diff --git a/devel/phabricator/files/patch-src_applications_search_engine_PhabricatorProfileMenuEngine.php b/devel/phabricator/files/patch-src_applications_search_engine_PhabricatorProfileMenuEngine.php
new file mode 100644
index 000000000000..cc794c9729a1
--- /dev/null
+++ b/devel/phabricator/files/patch-src_applications_search_engine_PhabricatorProfileMenuEngine.php
@@ -0,0 +1,22 @@
+--- src/applications/search/engine/PhabricatorProfileMenuEngine.php.orig	2022-01-26 14:23:11 UTC
++++ src/applications/search/engine/PhabricatorProfileMenuEngine.php
+@@ -99,7 +99,7 @@ abstract class PhabricatorProfileMenuEngine extends Ph
+     return $this->editMode;
+   }
+ 
+-  public function buildResponse() {
++  public function buildResponse($ignore_item_id = false) {
+     $controller = $this->getController();
+ 
+     $viewer = $controller->getViewer();
+@@ -130,6 +130,10 @@ abstract class PhabricatorProfileMenuEngine extends Ph
+       $item_id = $request->getURIData('id');
+     }
+ 
++    if ($ignore_item_id) {
++      $item_id = "";
++    }
++
+     $view_list = $this->newProfileMenuItemViewList();
+ 
+     if ($is_view) {