diff --git a/src/scripts/gendoc/doc_class.template b/src/scripts/gendoc/doc_class.template
index 04910d619d..9c02ebc2b7 100644
--- a/src/scripts/gendoc/doc_class.template
+++ b/src/scripts/gendoc/doc_class.template
@@ -98,7 +98,7 @@ No extensions defined in this class.
   <!--(if i == 0)-->
 ^ Local implemented ^^ event info ^
   <!--(end)-->
-| ''${ev.name}$'' | ${BEST_SUMMARY(obj=ev)}$ ${OBJECT_SCOPE(obj=ev)}$ ${EVENT_TAGS}$| ${TYPE_LINK(type=ev.type) if ev.type else 'None'}$ |
+| {{anchor:event_${ev.short_name.lower().replace(',','_')}$}}''${ev.name}$'' | ${BEST_SUMMARY(obj=ev)}$ ${OBJECT_SCOPE(obj=ev)}$ ${EVENT_TAGS}$| ${TYPE_LINK(type=ev.type) if ev.type else 'None'}$ |
 <!--(end)-->
 <!--(for cls2 in cls.inherits_full)-->
   <!--(for i, ev in enumerate(cls2.events))-->
diff --git a/src/scripts/gendoc/doc_macros.include b/src/scripts/gendoc/doc_macros.include
index 1527e09f43..6bb07af339 100644
--- a/src/scripts/gendoc/doc_macros.include
+++ b/src/scripts/gendoc/doc_macros.include
@@ -66,8 +66,10 @@ ${CLS_LINK(cls=token.ref_obj)}$.${FUNC_LINK(func=token.ref_attr)}$#!
 ${TYPEDECL_LINK(typedecl=token.ref_obj)}$#!
             <!--(elif token.ref_type == Eolian_Object_Type.CLASS)-->
 ${CLS_LINK(cls=token.ref_obj)}$#!
+            <!--(elif token.ref_type == Eolian_Object_Type.EVENT)-->
+${EVENT_LINK(cls=token.ref_obj, ev=token.ref_attr)}$#!
             <!--(else)-->
-**TODO REF ${token.ref_type}$**$#!
+**TODO REF ${token.ref_type}$** #!
             <!--(end)-->
          <!--(elif token.type == Eolian_Doc_Token_Type.MARKUP_MONOSPACE)-->
 ''${token.text}$''#!
@@ -121,13 +123,12 @@ interface#!
 #!####  EVENT_LINK(cls, ev)  ###################################################
 #!##############################################################################
 <!--(macro EVENT_LINK)-->
-[[:develop:api#!
+''[[:develop:api#!
    <!--(for n in cls.namespaces)-->
 :${n.lower()}$#!
    <!--(end)-->
 :${cls.short_name.lower()}$#!
-:event#!
-:${ev.short_name.lower().replace(',','_')}$|${ev.name}$]]
+#event_${ev.short_name.lower().replace(',','_')}$|${ev.name}$]]''
 <!--(end)-->
 #!##############################################################################
 #!####  TYPEDECL_LINK(typedecl)  ###############################################