diff --git a/xep-0390.xml b/xep-0390.xml
index c93d1f2c..839a7390 100644
--- a/xep-0390.xml
+++ b/xep-0390.xml
@@ -47,12 +47,7 @@
   </supersedes>
   <supersededby/>
   <shortname>ecaps2</shortname>
-  <author>
-    <firstname>Jonas</firstname>
-    <surname>Wielicki</surname>
-    <email>jonas@wielicki.name</email>
-    <jid>jonas@wielicki.name</jid>
-  </author>
+  &jonaswielicki;
   <revision>
     <version>0.2</version>
     <date>2017-06-14</date>
diff --git a/xep-0392.xml b/xep-0392.xml
index 161afc60..33e69c94 100644
--- a/xep-0392.xml
+++ b/xep-0392.xml
@@ -22,12 +22,7 @@
   <supersedes/>
   <supersededby/>
   <shortname>colors</shortname>
-  <author>
-    <firstname>Jonas</firstname>
-    <surname>Wielicki</surname>
-    <email>jonas@wielicki.name</email>
-    <jid>jonas@wielicki.name</jid>
-  </author>
+  &jonaswielicki;
   <revision>
     <version>0.4</version>
     <date>2017-11-29</date>
diff --git a/xep-0394.xml b/xep-0394.xml
index e1cc64fc..09364f76 100644
--- a/xep-0394.xml
+++ b/xep-0394.xml
@@ -18,12 +18,7 @@
   <supersedes/>
   <supersededby/>
   <shortname>markup</shortname>
-  <author>
-    <firstname>Jonas</firstname>
-    <surname>Wielicki</surname>
-    <email>jonas@wielicki.name</email>
-    <jid>jonas@wielicki.name</jid>
-  </author>
+  &jonaswielicki;
   <revision>
     <version>0.1.0</version>
     <date>2017-11-22</date>
diff --git a/xep.ent b/xep.ent
index f76e3f06..b66ff9d2 100644
--- a/xep.ent
+++ b/xep.ent
@@ -1069,6 +1069,14 @@ IANA Service Location Protocol, Version 2 (SLPv2) Templates</link></span> <note>
     <jid>vanitasvitae@jabberhead.tk</jid>
   </author>
 " >
+<!ENTITY jonaswielicki "
+  <author>
+    <firstname>Jonas</firstname>
+    <surname>Wielicki</surname>
+    <email>jonas@wielicki.name</email>
+    <jid>jonas@wielicki.name</jid>
+  </author>
+" >
 
 <!-- XMPP Extension Protocols -->