diff --git a/devel/phabricator/Makefile b/devel/phabricator/Makefile
index d3640759e896..dd89834555fa 100644
--- a/devel/phabricator/Makefile
+++ b/devel/phabricator/Makefile
@@ -15,11 +15,8 @@ RUN_DEPENDS=	${PHP_PKGNAMEPREFIX}libphutil>=20190831:devel/libphutil@${PHP_FLAVO
 		arcanist-lib${PHP_PKGNAMESUFFIX}>=20190622:devel/arcanist-lib@${PHP_FLAVOR} \
 		git:devel/git
 
-OPTIONS_DEFINE=	GD OPCACHE
-OPTIONS_DEFAULT=GD OPCACHE
-OPCACHE_DESC?=	Use OPcache to improve performance
-
 USES=		php:flavors shebangfix
+
 REINPLACE_ARGS=	-i ""
 SHEBANG_FILES=	scripts/*.php \
 		scripts/almanac/*.php \
@@ -46,6 +43,10 @@ SHEBANG_FILES=	scripts/*.php \
 USE_PHP=	ctype curl fileinfo filter hash iconv mbstring mysqli openssl \
 		pcntl posix zip
 
+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}
diff --git a/devel/phabricator/files/pkg-message.in b/devel/phabricator/files/pkg-message.in
index 13d8ef77e4ef..f03f06d656cd 100644
--- a/devel/phabricator/files/pkg-message.in
+++ b/devel/phabricator/files/pkg-message.in
@@ -43,26 +43,6 @@ A phabricator example configuration installed here:
 
   %%PREFIX%%lib/php/phabricator/conf/local/local.json.sample
 
-Don't forget to update the database schema after update:
-
-  service nginx stop
-  service php-fpm stop
-  service phd stop
-  cd %%PREFIX%%/lib/php/phabricator
-  ./bin/storage upgrade
-  service phd start
-  service php-fpm start
-  service nginx start
-
-The above procedure is for users of nginx and php-fpm, please adapt
-accordingly to match your setup.
-
-If your configuration uses an unprivileged user to connect to the database,
-you may have to override the default user so the schema changes can be
-applied with root or some other admin user:
-
-  ./bin/storage upgrade --user <user> --password <password>
-
 If you want to access phabricator hosted git repositories via git,
 you can add the following configuration snippet to /etc/sshd_config
 and reload sshd afterwards (`service sshd reload'):
@@ -85,5 +65,28 @@ Match User git
  X11Forwarding no
 ========================================================================
 EOM
+},
+{ type: upgrade
+  message: <<EOM
+Don't forget to update the database schema after update:
+
+  service nginx stop
+  service php-fpm stop
+  service phd stop
+  cd %%PREFIX%%/lib/php/phabricator
+  ./bin/storage upgrade
+  service phd start
+  service php-fpm start
+  service nginx start
+
+The above procedure is for users of nginx and php-fpm, please adapt
+accordingly to match your setup.
+
+If your configuration uses an unprivileged user to connect to the database,
+you may have to override the default user so the schema changes can be
+applied with root or some other admin user:
+
+  ./bin/storage upgrade --user <user> --password <password>
+EOM
 }
 ]