diff --git a/xep-0380.xml b/xep-0380.xml
index 9702bc39..c5a811e4 100644
--- a/xep-0380.xml
+++ b/xep-0380.xml
@@ -23,12 +23,7 @@
   <supersedes/>
   <supersededby/>
   <shortname>EME</shortname>
-  <author>
-    <firstname>Emmanuel Gil</firstname>
-    <surname>Peyrot</surname>
-    <email>linkmauve@linkmauve.fr</email>
-    <jid>linkmauve@linkmauve.fr</jid>
-  </author>
+  &linkmauve;
   <revision>
     <version>0.2.0</version>
     <date>2018-01-25</date>
diff --git a/xep.ent b/xep.ent
index 4a1146da..16fb7226 100644
--- a/xep.ent
+++ b/xep.ent
@@ -1082,6 +1082,14 @@ IANA Service Location Protocol, Version 2 (SLPv2) Templates</link></span> <note>
     <jid>jonas@wielicki.name</jid>
   </author>
 " >
+<!ENTITY linkmauve "
+  <author>
+    <firstname>Emmanuel Gil</firstname>
+    <surname>Peyrot</surname>
+    <email>linkmauve@linkmauve.fr</email>
+    <jid>linkmauve@linkmauve.fr</jid>
+  </author>
+" >
 
 <!-- XMPP Extension Protocols -->