diff --git a/KEYS.txt b/KEYS.txt
index 421c2b3e0f0..a902b2e94a1 100644
--- a/KEYS.txt
+++ b/KEYS.txt
@@ -1,5 +1,6 @@
 # GPG Release Key Fingerprints
 Jan Bartel        AED5 EE6C 45D0 FE8D 5D1B  164F 27DE D4BF 6216 DB
 Simone Bordet     8B09 6546 B1A8 F026 56B1  5D3B 1677 D141 BCF3 58
-Joakim Erdfelt    BFBB 21C2 46D7 7768 3628  7A48 A04E 0C74 ABB3 5F
+Joakim Erdfelt <joakim@erdfelt.com>  BFBB 21C2 46D7 7768 3628  7A48 A04E 0C74 ABB3 5FEA
+Joakim Erdfelt <joakim@apache.org>   B59B 67FD 7904 9843 67F9  3180 0818 D9D6 8FB6 7BAC
 Jesse McConnell   2A68 4B57 436A 81FA 8706  B53C 61C3 351A 438A 3B7D