diff --git a/example/example.tex b/example/example.tex
index 489da163d7fcdfa953eb6a19da23f9b628318fec..38329045059b869d669b089c32507f90cc18d914 100644
--- a/example/example.tex
+++ b/example/example.tex
@@ -31,9 +31,6 @@
   \addPerson{A person}{An institute}{A date}
 }
 
-\input{astron-abbreviations}
-\makeglossaries
-
 \begin{document}
 \maketitle
 
diff --git a/texmf/tex/latex/astron/astron-abbreviations.tex b/texmf/tex/latex/astron/astron-abbreviations.tex
index 692184283f67df4632ea3edb638832b7e11b1965..05d34af21552f182fa9f9120845fbb31f2d81859 100644
--- a/texmf/tex/latex/astron/astron-abbreviations.tex
+++ b/texmf/tex/latex/astron/astron-abbreviations.tex
@@ -36,7 +36,10 @@
 \newacronym{MT}{MT}{Management Team}
 \newacronym{NWO}{NWO}{Nederlandse Organisatie voor Wetenschappelijk Onderzoek}
 \newacronym{ORP}{ORP}{OPTICON--RadioNet Pilot}
+\newacronym{PID}{PID}{Persistent Identifier}
 \newacronym{QA}{QA}{Quality Assessment}
+\newacronym{RDMA}{RDMA}{Remote Direct Memory Access}
+\newacronym{SAMP}{SAMP}{Simple Application Messaging Protocol}
 \newacronym{SBe}{SBe}{Smart Backend}
 \newacronym{SDCO}{SDCO}{\Acrshort{SDC} Operations}
 \newacronym{SDCP}{SDCP}{\Acrshort{SDC} Program}
@@ -56,5 +59,3 @@
 \newacronym{TPU}{TPU}{Tensor Processing Unit}
 \newacronym{VM}{VM}{Virtual Machine}
 \newacronym{VO}{VO}{Virtual Observatory}
-\newacronym{SAMP}{SAMP}{Simple Application Messaging Protocol}
-
diff --git a/texmf/tex/latex/astron/astron.cls b/texmf/tex/latex/astron/astron.cls
index 40862ffb8b0d245f065551f83d0ac43b127147d5..b13534cf5630938dac6a8a959e69c1d03023a18e 100644
--- a/texmf/tex/latex/astron/astron.cls
+++ b/texmf/tex/latex/astron/astron.cls
@@ -89,6 +89,23 @@
 \RequirePackage{parskip}
 \RequirePackage{tabularx}
 
+% Set up glossaries
+\input{astron-abbreviations}
+\makeglossaries
+
+% Don't expand these acronyms in the text.
+\glsunset{API}
+\glsunset{Apertif}
+\glsunset{CPU}
+\glsunset{FTE}
+\glsunset{FTP}
+\glsunset{GPU}
+\glsunset{LOFAR}
+\glsunset{NWO}
+\glsunset{QA}
+\glsunset{RDMA}
+\glsunset{SSH}
+
 % Link to document repositories for appropriate e-prints in the bibliography
 \DeclareFieldFormat{eprint:sdc-handle}{%
   Doc handle\addcolon\space