diff --git a/_service b/_service
index a0594e6..fb1842a 100644
--- a/_service
+++ b/_service
@@ -5,7 +5,7 @@
     <param name="filename">caddy</param>
     <param name="versionformat">@PARENT_TAG@</param>
     <param name="versionrewrite-pattern">v(.*)</param>
-    <param name="revision">v2.8.1</param>
+    <param name="revision">v2.8.4</param>
     <param name="changesgenerate">enable</param>
 </service>
   <service mode="manual" name="set_version">
diff --git a/_servicedata b/_servicedata
index dd121fb..102731a 100644
--- a/_servicedata
+++ b/_servicedata
@@ -1,4 +1,4 @@
 <servicedata>
 <service name="tar_scm">
                 <param name="url">https://github.com/caddyserver/caddy.git</param>
-              <param name="changesrevision">40c582ce8273bf12b08e8e77df6498bca5f626a6</param></service></servicedata>
\ No newline at end of file
+              <param name="changesrevision">7088605cc11c52c2777ab613dfc5c2a9816006e4</param></service></servicedata>
\ No newline at end of file
diff --git a/caddy-2.8.1.tar.gz b/caddy-2.8.1.tar.gz
deleted file mode 100644
index 56e6ad1..0000000
--- a/caddy-2.8.1.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c95c03ab508c621a214e740b503d8db41c251bae4c76c265298413625bfc6bd9
-size 678233
diff --git a/caddy-2.8.4.tar.gz b/caddy-2.8.4.tar.gz
new file mode 100644
index 0000000..eb648a3
--- /dev/null
+++ b/caddy-2.8.4.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3e0792d64cf4c30314f078dff742dac165ce347cf75a4b1d929a82df50e4f655
+size 678314
diff --git a/caddy.changes b/caddy.changes
index b3330fc..6d2ac45 100644
--- a/caddy.changes
+++ b/caddy.changes
@@ -1,3 +1,19 @@
+-------------------------------------------------------------------
+Sun Jun 02 14:15:59 UTC 2024 - Jeff Kowalczyk <jkowalczyk@suse.com>
+
+- Update to version 2.8.4:
+  * cmd: fix regression in auto-detect of Caddyfile (#6362)
+  * Tag v2.8.3 was mistakenly made on the v2.8.2 commit and is skipped
+
+-------------------------------------------------------------------
+Sun Jun 02 05:05:05 UTC 2024 - Jeff Kowalczyk <jkowalczyk@suse.com>
+
+- Update to version 2.8.2:
+  * cmd: fix auto-detetction of .caddyfile extension (#6356)
+  * caddyhttp: properly sanitize requests for root path (#6360)
+  * caddytls: Implement certmagic.RenewalInfoGetter
+  * build(deps): bump golangci/golangci-lint-action from 5 to 6 (#6361)
+
 -------------------------------------------------------------------
 Thu May 30 16:17:13 UTC 2024 - Jeff Kowalczyk <jkowalczyk@suse.com>
 
diff --git a/caddy.spec b/caddy.spec
index 180cee0..18b708f 100644
--- a/caddy.spec
+++ b/caddy.spec
@@ -25,7 +25,7 @@
 %endif
 
 Name:           caddy
-Version:        2.8.1
+Version:        2.8.4
 Release:        0
 Summary:        Fast, multi-platform web server with automatic HTTPS
 License:        Apache-2.0
diff --git a/vendor.tar.gz b/vendor.tar.gz
index e8c0a85..8cf7118 100644
--- a/vendor.tar.gz
+++ b/vendor.tar.gz
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:09f9e9d32913e127a94190df961ebd4f8c058b19b2b4314193a502bac54d03c5
-size 9782329
+oid sha256:b7c720de94ae3f6e752f03e9f07b3304c3ee3ef0e9f68ec99642779a7c4db9a3
+size 9782477