diff --git a/.SRCINFO b/.SRCINFO
index b6e744f..15766a6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = caddy
 	pkgdesc = Fast web server with automatic HTTPS
-	pkgver = 2.7.6
+	pkgver = 2.8.4
 	pkgrel = 1
 	url = https://github.com/caddyserver/caddy
 	arch = x86_64
@@ -9,8 +9,8 @@ pkgbase = caddy
 	makedepends = git
 	depends = glibc
 	backup = etc/caddy/Caddyfile
-	source = git+https://github.com/caddyserver/caddy#tag=v2.7.6?signed
-	source = caddy-dist::git+https://github.com/caddyserver/dist#commit=0c7fa00a87c65a6ef47ed36d841cd223682a2a2c
+	source = git+https://github.com/caddyserver/caddy.git#tag=v2.8.4?signed
+	source = caddy-dist::git+https://github.com/caddyserver/dist.git#tag=v2.8.4
 	source = caddy.service
 	source = caddy-api.service
 	source = caddy.tmpfiles
@@ -19,10 +19,10 @@ pkgbase = caddy
 	source = use-data-dir-for-autosave.patch
 	source = override-main-module-version.patch
 	validpgpkeys = 29D0817A67156E4F25DC24782A349DD577D586A5
-	sha512sums = SKIP
-	sha512sums = SKIP
-	sha512sums = 54e5020a000f364677f107b4d23deb6ea09b2ab51c58251365c87832d99045a82e0fc71c74a256cab0bd6a5ea19036fb63f9ab8f64b153c2d898164585d18ebc
-	sha512sums = a69f9356d19c282b63e5179c5ddad344ce1586da6cc1c502ae537c14ee847375a4ce2015a140fc4d99a958041b8b51f4749645ffff0bea8ba7e7f9f92fb6e12b
+	sha512sums = 20170f3bd5ce291af6b9506f364ecb43a853e546b06b3124554829c52504a1feed250500588c13ce824db73049e8a6a6bf5feb622547c4ad6d700439c6ef1319
+	sha512sums = 1420146603d3a104c454323c3f579cfea46bf32d0ffae94739a547a4c5032170d6e0cec02b58f70e1e9f6488bd08e959fae072ff4848e3c718359d74e6aa6d9c
+	sha512sums = 78b01fa7156cab0df0d5923250a0e85f6e2dddb2b01b9ea66b49d3e17b228954491922fac6339fcc2caa8342168ca138061a9c4eff41a7a5b6a86e7f9ecb885e
+	sha512sums = 164037ea69ef02e9fdc55af3760849500fd90aa6d23ca29d55cc29c758041bef7e7cf89b23c7e0870bfbd2ecbb576fa9adf33c7c45bcabe68d15be4d6fc49145
 	sha512sums = 55ee8d3f8b14f9adddc7a1026addcea4f85b4bae4cd512fd4da2a5e8adaae4b6fd0f486d2e3847f75518f4710a897b4fca84e48ee15700b968bad762125c4742
 	sha512sums = c893d88fec89e37da6596030c8dce7103e7e575371e8542a24d2a0741e877358d85219f2d8ade9d6aa0f515efe1156a4badd9fef5f65f553a5b0c72330c4728f
 	sha512sums = 716da3f4edeb3561243aeaf5c32b01ff7a4ac810b6deba8364fb12a1f71b6a5278c34a97b289bcfdc48784679b942bf780f1f36d416a575791168c94b0d59fe0
diff --git a/PKGBUILD b/PKGBUILD
index af9bc55..f55533e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,9 +7,7 @@
 # Contributor: Akshay S Dinesh <asdofindia at gmail dot com>
 
 pkgname=caddy
-pkgver=2.7.6
-_gitcommit=v2.7.6
-_distcommit=0c7fa00a87c65a6ef47ed36d841cd223682a2a2c
+pkgver=2.8.4
 pkgrel=1
 pkgdesc='Fast web server with automatic HTTPS'
 url='https://github.com/caddyserver/caddy'
@@ -18,8 +16,8 @@ license=('Apache')
 depends=('glibc')
 makedepends=('go' 'git')
 backup=('etc/caddy/Caddyfile')
-source=("git+https://github.com/caddyserver/caddy#tag=${_gitcommit}?signed"
-        caddy-dist::"git+https://github.com/caddyserver/dist#commit=${_distcommit}"
+source=("git+https://github.com/caddyserver/caddy.git#tag=v${pkgver}?signed"
+        caddy-dist::"git+https://github.com/caddyserver/dist.git#tag=v${pkgver}"
         caddy.service
         caddy-api.service
         caddy.tmpfiles
@@ -27,10 +25,10 @@ source=("git+https://github.com/caddyserver/caddy#tag=${_gitcommit}?signed"
         Caddyfile
         use-data-dir-for-autosave.patch
         override-main-module-version.patch)
-sha512sums=('SKIP'
-            'SKIP'
-            '54e5020a000f364677f107b4d23deb6ea09b2ab51c58251365c87832d99045a82e0fc71c74a256cab0bd6a5ea19036fb63f9ab8f64b153c2d898164585d18ebc'
-            'a69f9356d19c282b63e5179c5ddad344ce1586da6cc1c502ae537c14ee847375a4ce2015a140fc4d99a958041b8b51f4749645ffff0bea8ba7e7f9f92fb6e12b'
+sha512sums=('20170f3bd5ce291af6b9506f364ecb43a853e546b06b3124554829c52504a1feed250500588c13ce824db73049e8a6a6bf5feb622547c4ad6d700439c6ef1319'
+            '1420146603d3a104c454323c3f579cfea46bf32d0ffae94739a547a4c5032170d6e0cec02b58f70e1e9f6488bd08e959fae072ff4848e3c718359d74e6aa6d9c'
+            '78b01fa7156cab0df0d5923250a0e85f6e2dddb2b01b9ea66b49d3e17b228954491922fac6339fcc2caa8342168ca138061a9c4eff41a7a5b6a86e7f9ecb885e'
+            '164037ea69ef02e9fdc55af3760849500fd90aa6d23ca29d55cc29c758041bef7e7cf89b23c7e0870bfbd2ecbb576fa9adf33c7c45bcabe68d15be4d6fc49145'
             '55ee8d3f8b14f9adddc7a1026addcea4f85b4bae4cd512fd4da2a5e8adaae4b6fd0f486d2e3847f75518f4710a897b4fca84e48ee15700b968bad762125c4742'
             'c893d88fec89e37da6596030c8dce7103e7e575371e8542a24d2a0741e877358d85219f2d8ade9d6aa0f515efe1156a4badd9fef5f65f553a5b0c72330c4728f'
             '716da3f4edeb3561243aeaf5c32b01ff7a4ac810b6deba8364fb12a1f71b6a5278c34a97b289bcfdc48784679b942bf780f1f36d416a575791168c94b0d59fe0'
@@ -40,10 +38,10 @@ validpgpkeys=(
   29D0817A67156E4F25DC24782A349DD577D586A5 # Matthew Holt <mholt@users.noreply.github.com>
 )
 
-pkgver() {
-  cd ${pkgname}
-  git describe --tags --match 'v*' | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
-}
+#pkgver() {
+#  cd ${pkgname}
+#  git describe --tags --match 'v*' | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
+#}
 
 prepare() {
   cd "${pkgname}"