diff --git a/devel/gitlab-shell/Makefile b/devel/gitlab-shell/Makefile
index 56da78f93151..49b98c84d073 100644
--- a/devel/gitlab-shell/Makefile
+++ b/devel/gitlab-shell/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	gitlab-shell
-PORTVERSION=	8.1.1
+PORTVERSION=	8.3.3
 CATEGORIES=	devel
 
 MAINTAINER=	mfechner@FreeBSD.org
@@ -16,7 +16,7 @@ BUILD_DEPENDS=	gem:devel/ruby-gems \
 USE_GITLAB=	yes
 GL_ACCOUNT=	gitlab-org
 # Find the commit hash here: https://gitlab.com/gitlab-org/gitlab-shell/tags
-GL_COMMIT=	5287eee65e7f29e8d5296eb3ef24a06a9a60b3f1
+GL_COMMIT=	4b19de3a1897d06c3e0d530f679c6f56e250ca41
 
 USERS=		git
 GROUPS=		git
diff --git a/devel/gitlab-shell/distinfo b/devel/gitlab-shell/distinfo
index 2ce65d3fa7e2..e8627c3bb690 100644
--- a/devel/gitlab-shell/distinfo
+++ b/devel/gitlab-shell/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1535126431
-SHA256 (gitlab-org-gitlab-shell-5287eee65e7f29e8d5296eb3ef24a06a9a60b3f1_GL0.tar.gz) = 31f87dad90fa8871cf743ac1d8a322324cdc144685a83b32bca1342b003dfb60
-SIZE (gitlab-org-gitlab-shell-5287eee65e7f29e8d5296eb3ef24a06a9a60b3f1_GL0.tar.gz) = 1560578
+TIMESTAMP = 1537567084
+SHA256 (gitlab-org-gitlab-shell-4b19de3a1897d06c3e0d530f679c6f56e250ca41_GL0.tar.gz) = c197935f0461746dc30ce3c5ad3307796e931796282dba099bb7410baf546050
+SIZE (gitlab-org-gitlab-shell-4b19de3a1897d06c3e0d530f679c6f56e250ca41_GL0.tar.gz) = 1564456
diff --git a/devel/gitlab-shell/pkg-plist b/devel/gitlab-shell/pkg-plist
index 2cdfac95fdd8..225ab89f91b3 100644
--- a/devel/gitlab-shell/pkg-plist
+++ b/devel/gitlab-shell/pkg-plist
@@ -7,7 +7,6 @@
 %%DATADIR%%/CONTRIBUTING.md
 %%DATADIR%%/Gemfile
 %%DATADIR%%/Gemfile.lock
-%%DATADIR%%/Guardfile
 %%DATADIR%%/LICENSE
 %%DATADIR%%/README.md
 %%DATADIR%%/VERSION
@@ -28,6 +27,8 @@
 @(,,555) %%DATADIR%%/hooks/post-receive
 @(,,555) %%DATADIR%%/hooks/pre-receive
 @(,,555) %%DATADIR%%/hooks/update
+%%DATADIR%%/lib/action.rb
+%%DATADIR%%/lib/action/custom.rb
 %%DATADIR%%/lib/gitlab_access.rb
 %%DATADIR%%/lib/gitlab_access_status.rb
 %%DATADIR%%/lib/gitlab_config.rb
@@ -41,9 +42,11 @@
 %%DATADIR%%/lib/gitlab_post_receive.rb
 %%DATADIR%%/lib/gitlab_shell.rb
 %%DATADIR%%/lib/httpunix.rb
+%%DATADIR%%/lib/http_codes.rb
 %%DATADIR%%/lib/http_helper.rb
 %%DATADIR%%/lib/names_helper.rb
 %%DATADIR%%/lib/object_dirs_helper.rb
+%%DATADIR%%/spec/action/custom_spec.rb
 %%DATADIR%%/spec/gitlab_access_spec.rb
 %%DATADIR%%/spec/gitlab_config_spec.rb
 %%DATADIR%%/spec/gitlab_custom_hook_spec.rb
@@ -61,14 +64,27 @@
 %%DATADIR%%/spec/object_dirs_helper_spec.rb
 %%DATADIR%%/spec/spec_helper.rb
 %%DATADIR%%/spec/support/gl_id_test_hook
+%%DATADIR%%/spec/support/http_unix_server.rb
 %%DATADIR%%/support/go-update-vendor
 %%DATADIR%%/spec/support/hook_fail
 %%DATADIR%%/spec/support/hook_ok
+%%DATADIR%%/spec/support/vcr.rb
+%%DATADIR%%/spec/support/webmock.rb
 %%DATADIR%%/spec/vcr_cassettes/allowed-pull.yml
 %%DATADIR%%/spec/vcr_cassettes/allowed-push.yml
+%%DATADIR%%/spec/vcr_cassettes/allowed-push-project-not-found-404-text-html.yml
+%%DATADIR%%/spec/vcr_cassettes/allowed-push-project-not-found-404-text-plain.yml
+%%DATADIR%%/spec/vcr_cassettes/allowed-push-project-not-found-404.yml
+%%DATADIR%%/spec/vcr_cassettes/allowed-push-project-not-found-text-html.yml
+%%DATADIR%%/spec/vcr_cassettes/allowed-push-project-not-found-text-plain.yml
+%%DATADIR%%/spec/vcr_cassettes/allowed-push-project-not-found.yml
 %%DATADIR%%/spec/vcr_cassettes/broadcast_message-none.yml
 %%DATADIR%%/spec/vcr_cassettes/broadcast_message-ok.yml
 %%DATADIR%%/spec/vcr_cassettes/check-ok.yml
+%%DATADIR%%/spec/vcr_cassettes/custom-action-not-ok-json.yml
+%%DATADIR%%/spec/vcr_cassettes/custom-action-not-ok-not-json.yml
+%%DATADIR%%/spec/vcr_cassettes/custom-action-ok-not-json.yml
+%%DATADIR%%/spec/vcr_cassettes/custom-action-ok.yml
 %%DATADIR%%/spec/vcr_cassettes/discover-ok.yml
 %%DATADIR%%/spec/vcr_cassettes/http-pull-disabled.yml
 %%DATADIR%%/spec/vcr_cassettes/http-push-disabled.yml
@@ -83,8 +99,14 @@
 %%DATADIR%%/spec/vcr_cassettes/ssh-key-ok.yml
 %%DATADIR%%/spec/vcr_cassettes/ssh-pull-disabled.yml
 %%DATADIR%%/spec/vcr_cassettes/ssh-pull-project-denied.yml
+%%DATADIR%%/spec/vcr_cassettes/ssh-pull-project-denied-401-text-html.yml
+%%DATADIR%%/spec/vcr_cassettes/ssh-pull-project-denied-401-text-plain.yml
+%%DATADIR%%/spec/vcr_cassettes/ssh-pull-project-denied-401.yml
+%%DATADIR%%/spec/vcr_cassettes/ssh-pull-project-denied-with-user.yml
 %%DATADIR%%/spec/vcr_cassettes/ssh-push-disabled.yml
-%%DATADIR%%/spec/vcr_cassettes/ssh-push-project-denied-with-user.yml
+%%DATADIR%%/spec/vcr_cassettes/ssh-push-project-denied-401-text-html.yml
+%%DATADIR%%/spec/vcr_cassettes/ssh-push-project-denied-401-text-plain.yml
+%%DATADIR%%/spec/vcr_cassettes/ssh-push-project-denied-401.yml
 %%DATADIR%%/spec/vcr_cassettes/ssh-push-project-denied.yml
 %%DATADIR%%/spec/vcr_cassettes/two-factor-recovery-codes-fail.yml
 %%DATADIR%%/spec/vcr_cassettes/two-factor-recovery-codes.yml