diff --git a/CHANGELOG.md b/CHANGELOG.md
index d8b0d9d8593e7141278b529f8c0035c58d4d1172..515a92db0b4f3ffb71e932238a16e8b38c509334 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,10 @@
 The latest version of this file can be found at the master branch of the
 omnibus-gitlab repository.
 
+8.15.0
+
+- Update git to 2.8.4
+
 8.14.0
 
 - Switch the redis user's shell to /bin/false 9d60ee4
diff --git a/config/software/git.rb b/config/software/git.rb
index 5d92feb1eac5c3a05d7d1390f0315b5df56db15e..49eab2f7268e517dd24d0415c5a3309c8f7d56c2 100644
--- a/config/software/git.rb
+++ b/config/software/git.rb
@@ -17,7 +17,7 @@
 #
 
 name "git"
-default_version "2.7.4"
+default_version "2.8.4"
 
 license "GPL-2.0"
 license_file "COPYING"
@@ -26,8 +26,8 @@ dependency "zlib"
 dependency "openssl"
 dependency "curl"
 
-source :url => "https://www.kernel.org/pub/software/scm/git/git-#{version}.tar.gz",
-       :md5 => "c64012d491e24c7d65cd389f75383d91"
+source url: "https://www.kernel.org/pub/software/scm/git/git-#{version}.tar.gz",
+       sha256: "626e319f8a24fc0866167ea5f6bf3e2f38f69d6cb2e59e150f13709ca3ebf301"
 
 relative_path "git-#{version}"