diff --git a/www/gitlab-ce/Makefile b/www/gitlab-ce/Makefile
index 26f6b8737eb2..9d0720ea5aee 100644
--- a/www/gitlab-ce/Makefile
+++ b/www/gitlab-ce/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	gitlab-ce
-PORTVERSION=	11.6.1
+PORTVERSION=	11.6.4
 CATEGORIES=	www devel
 
 MAINTAINER=	mfechner@FreeBSD.org
@@ -113,7 +113,7 @@ MY_DEPENDS=	git>=2.16.2:devel/git \
 	rubygem-sidekiq>=5.2.1:devel/rubygem-sidekiq \
 	rubygem-sidekiq-cron0>=0.6.0:devel/rubygem-sidekiq-cron0 \
 	rubygem-redis-namespace>=1.6.0:databases/rubygem-redis-namespace \
-	rubygem-gitlab-sidekiq-fetcher>0.1.0:devel/rubygem-gitlab-sidekiq-fetcher \
+	rubygem-gitlab-sidekiq-fetcher>=0.4.0:devel/rubygem-gitlab-sidekiq-fetcher \
 	rubygem-rufus-scheduler342>=3.4.0:devel/rubygem-rufus-scheduler342 \
 	rubygem-httparty>=0.13.3:www/rubygem-httparty \
 	rubygem-rainbow>=3.0:devel/rubygem-rainbow \
@@ -219,7 +219,7 @@ USE_RC_SUBR=	gitlab
 USE_GITLAB=	yes
 GL_ACCOUNT=	gitlab-org
 # Find the here: https://gitlab.com/gitlab-org/gitlab-ce/tags
-GL_COMMIT=	598c5a7b9ddc0afbd0890d79c82088b80d706483
+GL_COMMIT=	300fef12295e24e33b7d180679d0f7c4333d91b7
 
 USERS=	git
 GROUPS=	git
diff --git a/www/gitlab-ce/distinfo b/www/gitlab-ce/distinfo
index fcc6a91045e4..c089d187ff1a 100644
--- a/www/gitlab-ce/distinfo
+++ b/www/gitlab-ce/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1546421131
-SHA256 (gitlab-org-gitlab-ce-598c5a7b9ddc0afbd0890d79c82088b80d706483_GL0.tar.gz) = a393c1e44d1bcbafad147180c1183a42178ebba8095747b6ceb7e14ecf884d51
-SIZE (gitlab-org-gitlab-ce-598c5a7b9ddc0afbd0890d79c82088b80d706483_GL0.tar.gz) = 49847798
+TIMESTAMP = 1547682529
+SHA256 (gitlab-org-gitlab-ce-300fef12295e24e33b7d180679d0f7c4333d91b7_GL0.tar.gz) = 4ed006ae14dd76d033ff90a95b623cce3c7388c7b043505d25acff4098cc654a
+SIZE (gitlab-org-gitlab-ce-300fef12295e24e33b7d180679d0f7c4333d91b7_GL0.tar.gz) = 49852433
diff --git a/www/gitlab-ce/files/patch-Gemfile b/www/gitlab-ce/files/patch-Gemfile
index cc1163aa9629..52cdf7e7ca1e 100644
--- a/www/gitlab-ce/files/patch-Gemfile
+++ b/www/gitlab-ce/files/patch-Gemfile
@@ -1,4 +1,4 @@
---- Gemfile.orig	2018-12-21 14:23:37 UTC
+--- Gemfile.orig	2019-01-04 23:19:12 UTC
 +++ Gemfile
 @@ -5,7 +5,7 @@ end
  
@@ -18,14 +18,7 @@
  gem 'pg', '~> 0.18.2', group: :postgres
  
  gem 'rugged', '~> 0.27'
-@@ -181,13 +181,13 @@ gem 'acts-as-taggable-on', '~> 5.0'
- gem 'sidekiq', '~> 5.2.1'
- gem 'sidekiq-cron', '~> 0.6.0'
- gem 'redis-namespace', '~> 1.6.0'
--gem 'gitlab-sidekiq-fetcher', '~> 0.1.0', require: 'sidekiq-reliable-fetch'
-+gem 'gitlab-sidekiq-fetcher', '~> 0.4.0', require: 'sidekiq-reliable-fetch'
- 
- # Cron Parser
+@@ -187,7 +187,7 @@ gem 'gitlab-sidekiq-fetcher', '~> 0.4.0', require: 'si
  gem 'rufus-scheduler', '~> 3.4'
  
  # HTTP requests
diff --git a/www/gitlab-ce/pkg-plist b/www/gitlab-ce/pkg-plist
index 1dffc4c06126..957b0e643876 100644
--- a/www/gitlab-ce/pkg-plist
+++ b/www/gitlab-ce/pkg-plist
@@ -9958,6 +9958,7 @@
 %%WWWDIR%%/lib/gitlab/git/blame.rb
 %%WWWDIR%%/lib/gitlab/git/blob.rb
 %%WWWDIR%%/lib/gitlab/git/branch.rb
+%%WWWDIR%%/lib/gitlab/git/bundle_file.rb
 %%WWWDIR%%/lib/gitlab/git/commit.rb
 %%WWWDIR%%/lib/gitlab/git/commit_stats.rb
 %%WWWDIR%%/lib/gitlab/git/compare.rb
@@ -12072,6 +12073,7 @@
 %%WWWDIR%%/spec/fixtures/junit/junit_with_three_testsuites_2.xml
 %%WWWDIR%%/spec/fixtures/junit/junit_with_three_testsuites_3.xml
 %%WWWDIR%%/spec/fixtures/logo_sample.svg
+%%WWWDIR%%/spec/fixtures/malicious.bundle
 %%WWWDIR%%/spec/fixtures/markdown.md.erb
 %%WWWDIR%%/spec/fixtures/metrics.json
 %%WWWDIR%%/spec/fixtures/missing_metadata.po
@@ -12136,6 +12138,7 @@
 %%WWWDIR%%/spec/graphql/types/query_type_spec.rb
 %%WWWDIR%%/spec/graphql/types/time_type_spec.rb
 %%WWWDIR%%/spec/helpers/application_helper_spec.rb
+%%WWWDIR%%/spec/helpers/application_settings_helper_spec.rb
 %%WWWDIR%%/spec/helpers/auth_helper_spec.rb
 %%WWWDIR%%/spec/helpers/auto_devops_helper_spec.rb
 %%WWWDIR%%/spec/helpers/avatars_helper_spec.rb
@@ -13378,6 +13381,7 @@
 %%WWWDIR%%/spec/lib/gitlab/git/blame_spec.rb
 %%WWWDIR%%/spec/lib/gitlab/git/blob_spec.rb
 %%WWWDIR%%/spec/lib/gitlab/git/branch_spec.rb
+%%WWWDIR%%/spec/lib/gitlab/git/bundle_file_spec.rb
 %%WWWDIR%%/spec/lib/gitlab/git/commit_spec.rb
 %%WWWDIR%%/spec/lib/gitlab/git/compare_spec.rb
 %%WWWDIR%%/spec/lib/gitlab/git/conflict/file_spec.rb