diff --git a/share/pgpkeys/sunpoet.key b/share/pgpkeys/sunpoet.key
index 55f97def7f..6de702cfea 100644
--- a/share/pgpkeys/sunpoet.key
+++ b/share/pgpkeys/sunpoet.key
@@ -1,101 +1,38 @@
-uid Po-Chuan Hsieh (sunpoet)
-sub 4096R/ADE9E203 2010-09-21
+pub ed25519/9A4BD10F002DD04B 2018-12-31 [SC]
+ Key fingerprint = 6448 C1A7 A9BE 24CC 868E DE72 9A4B D10F 002D D04B
+uid Po-Chuan Hsieh
+uid Po-Chuan Hsieh
+sub cv25519/E33F6551F35D4BAE 2018-12-31 [E]
+ Key fingerprint = 2835 0E57 A5C2 A5B7 69E5 B3E9 E33F 6551 F35D 4BAE
+sub ed25519/D49B456A2CEB429C 2018-12-31 [A]
+ Key fingerprint = 5C17 4004 710B 9F3C 1D53 E2DD D49B 456A 2CEB 429C
+
]]>