diff --git a/share/xml/authors.ent b/share/xml/authors.ent
index 3f78897670..04df3f5910 100644
--- a/share/xml/authors.ent
+++ b/share/xml/authors.ent
@@ -2480,3 +2480,7 @@
 <!ENTITY a.so.email '&a.delphij.email;'>
 
 <!ENTITY a.so-team '&a.delphij;, &a.des;, &a.gavin;, &a.gjb;, &a.glebius;, &a.remko;'>
+
+<!-- FreeBSD cluster entities -->
+<!ENTITY a.keymaster "Self-Serve SSH key changer">
+<!ENTITY a.keymaster.email "&a.keymaster; <email xmlns='http://docbook.org/ns/docbook'>keymaster@FreeBSD.org</email>">