diff --git a/distributions b/distributions
index 1d01150b0f..5867460ab0 160000
--- a/distributions
+++ b/distributions
@@ -1 +1 @@
-Subproject commit 1d01150b0fab1ee8a6b5021e51398662d17be065
+Subproject commit 5867460ab00206ac6a77aa497ce0cf4e076aa38b
diff --git a/include/gpg-keys.inc b/include/gpg-keys.inc
index df5bc8c61c..f62a7373e2 100644
--- a/include/gpg-keys.inc
+++ b/include/gpg-keys.inc
@@ -10,7 +10,7 @@ function gpg_key_get(string $rm): ?string {
                 "pub   2048R/9C0D5763 2015-06-09 [expires: 2024-06-06]\n" .
                 "      Key fingerprint = 1A4E 8B72 77C4 2E53 DBA9  C7B9 BCAA 30EA 9C0D 5763\n" .
                 "uid                  Anatol Belski <ab@php.net>";
-        
+
         case 'bukka':
             return
                 "pub   ed25519 2021-04-10 [SC]\n" .
@@ -20,6 +20,13 @@ function gpg_key_get(string $rm): ?string {
                 "uid           [ultimate] Jakub Zelenka <jakub.zelenka@gmail.com>\n" .
                 "sub   cv25519 2021-04-10 [E]";
 
+        case "calvinb":
+            return
+                "pub   ed25519 2024-04-17 [SC]\n" .
+                "      9D7F 99A0 CB8F 05C8 A695  8D62 56A9 7AF7 600A 39A6\n" .
+                "uid           [ultimate] Calvin Buckley (PHP) <calvinb@php.net>\n" .
+                "sub   cv25519 2024-04-17 [E]";
+
         case 'carusogabriel-old':
             return
                 "pub   rsa4096 2020-05-09 [SC] [expires: 2024-05-08]\n" .
@@ -133,6 +140,13 @@ function gpg_key_get(string $rm): ?string {
                 "      Key fingerprint = B1B4 4D8F 021E 4E2D 6021  E995 DC9F F8D3 EE5A F27F\n" .
                 "uid                  Remi Collet <remi@php.net>";
 
+        case 'saki':
+            return
+                "pub   rsa4096 2024-05-20 [SC]\n" .
+                "      0616 E93D 95AF 4712 43E2  6761 7704 26E1 7EBB B3DD\n" .
+                "uid           [ultimate] Saki Takamachi (for php.net) <saki@php.net>\n" .
+                "sub   rsa4096 2024-05-20 [E]";
+
         case 'sergey':
             return
                 "pub   rsa4096 2021-03-26 [SC] [expires: 2030-03-26]\n" .
@@ -163,6 +177,7 @@ function gpg_key_get(string $rm): ?string {
 
 function gpg_key_get_branches(bool $activeOnly): array {
     $branches = [
+        '8.4' => ['ericmann', 'calvinb', 'saki'],
         '8.3' => ['pierrick', 'ericmann', 'bukka'],
         '8.2' => ['pierrick', 'ramsey', 'sergey'],
         '8.1' => ['krakjoe', 'ramsey', 'patrickallaert'],