diff --git a/devel/gitlab-shell/Makefile b/devel/gitlab-shell/Makefile
index 4ec97acf7bbf..56da78f93151 100644
--- a/devel/gitlab-shell/Makefile
+++ b/devel/gitlab-shell/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	gitlab-shell
-PORTVERSION=	7.1.4
+PORTVERSION=	8.1.1
 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=	6a15f1db609acd6b7dadb2a88d4f5aff3500f160
+GL_COMMIT=	5287eee65e7f29e8d5296eb3ef24a06a9a60b3f1
 
 USERS=		git
 GROUPS=		git
diff --git a/devel/gitlab-shell/distinfo b/devel/gitlab-shell/distinfo
index 527751304d87..2ce65d3fa7e2 100644
--- a/devel/gitlab-shell/distinfo
+++ b/devel/gitlab-shell/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1530371268
-SHA256 (gitlab-org-gitlab-shell-6a15f1db609acd6b7dadb2a88d4f5aff3500f160_GL0.tar.gz) = 7d3a5e1380b575f24194022499889f06bc81d84edb2df2fab4e4651fb77b6cf4
-SIZE (gitlab-org-gitlab-shell-6a15f1db609acd6b7dadb2a88d4f5aff3500f160_GL0.tar.gz) = 1547952
+TIMESTAMP = 1535126431
+SHA256 (gitlab-org-gitlab-shell-5287eee65e7f29e8d5296eb3ef24a06a9a60b3f1_GL0.tar.gz) = 31f87dad90fa8871cf743ac1d8a322324cdc144685a83b32bca1342b003dfb60
+SIZE (gitlab-org-gitlab-shell-5287eee65e7f29e8d5296eb3ef24a06a9a60b3f1_GL0.tar.gz) = 1560578
diff --git a/devel/gitlab-shell/pkg-plist b/devel/gitlab-shell/pkg-plist
index 735e2a7e43e9..2cdfac95fdd8 100644
--- a/devel/gitlab-shell/pkg-plist
+++ b/devel/gitlab-shell/pkg-plist
@@ -2,6 +2,7 @@
 %%DATADIR%%/.gitignore
 %%DATADIR%%/.gitlab-ci.yml
 %%DATADIR%%/.rubocop.yml
+%%DATADIR%%/.ruby-version
 %%DATADIR%%/CHANGELOG
 %%DATADIR%%/CONTRIBUTING.md
 %%DATADIR%%/Gemfile
@@ -20,6 +21,7 @@
 @(,,555) %%DATADIR%%/bin/gitlab-keys
 @(,,555) %%DATADIR%%/bin/gitlab-shell
 @(,,555) %%DATADIR%%/bin/gitlab-shell-authorized-keys-check
+@(,,555) %%DATADIR%%/bin/gitlab-shell-authorized-principals-check
 @(,,555) %%DATADIR%%/bin/install
 @(,,555) %%DATADIR%%/bin/test-logger
 @sample %%DATADIR%%/config.yml.sample
@@ -39,6 +41,7 @@
 %%DATADIR%%/lib/gitlab_post_receive.rb
 %%DATADIR%%/lib/gitlab_shell.rb
 %%DATADIR%%/lib/httpunix.rb
+%%DATADIR%%/lib/http_helper.rb
 %%DATADIR%%/lib/names_helper.rb
 %%DATADIR%%/lib/object_dirs_helper.rb
 %%DATADIR%%/spec/gitlab_access_spec.rb
@@ -51,12 +54,14 @@
 %%DATADIR%%/spec/gitlab_net_spec.rb
 %%DATADIR%%/spec/gitlab_post_receive_spec.rb
 %%DATADIR%%/spec/gitlab_shell_authorized_keys_check_spec.rb
+%%DATADIR%%/spec/gitlab_shell_gitlab_shell_spec.rb
 %%DATADIR%%/spec/gitlab_shell_spec.rb
 %%DATADIR%%/spec/httpunix_spec.rb
 %%DATADIR%%/spec/names_helper_spec.rb
 %%DATADIR%%/spec/object_dirs_helper_spec.rb
 %%DATADIR%%/spec/spec_helper.rb
 %%DATADIR%%/spec/support/gl_id_test_hook
+%%DATADIR%%/support/go-update-vendor
 %%DATADIR%%/spec/support/hook_fail
 %%DATADIR%%/spec/support/hook_ok
 %%DATADIR%%/spec/vcr_cassettes/allowed-pull.yml