diff --git a/templates/wiki.latex b/templates/wiki.latex
index 8ea485a..9800444 100644
--- a/templates/wiki.latex
+++ b/templates/wiki.latex
@@ -521,6 +521,36 @@ $endif$
    \endorigfigure
 }
 
+\usepackage{acro}
+\NewAcroTemplate[list]{acrolist}{%
+	\AcroNeedPackage{array}%
+	\acronymsmapF{%
+		\AcroAddRow{
+			\acrowrite{short}%
+			\acroifT{alt}{/\acrowrite{alt}}
+			&~---~
+			\acrowrite{list}%
+			\acroifanyT{foreign,extra}{ (}%
+			\acroifT{foreign}{\acrowrite{foreign}\acroifT{extra}{, }}%
+			\acroifT{extra}{\acrowrite{extra}}%
+			\acroifanyT{foreign,extra}{)}%
+			\acropagefill
+			\acropages
+				{\acrotranslate{page}\nobreakspace}
+				{\acrotranslate{pages}\nobreakspace}%
+			\tabularnewline
+		}%
+	}
+	{\AcroRerun}%
+	\acroheading
+	\acropreamble
+	\par\noindent
+	\begin{tabular}{>{}lp{.7\linewidth}}
+		\AcronymTable
+	\end{tabular}
+}
+\acsetup{make-links = true, pdfcomments/use = true, list/template = acrolist, first-style = short}
+
 \begin{document}
 $if(has-frontmatter)$
 \frontmatter