diff --git a/combat.tex b/combat.tex
index 111084513f0f5ef006245aaf4da0a44d9aa12efc..a71096f12bd1824f102664c0122a6db338b972a4 100644
--- a/combat.tex
+++ b/combat.tex
@@ -196,15 +196,15 @@ Injury is paid in \glspl{fp} while they last, then Damage starts to take large c
 
 \begin{multicols}{2}
 
-\subsection{Weapons}
+\subsection{\Glsfmtplural{weapon}}
 
 \noindent
-Weapons are a great way of inflicting additional Damage, and an equally excellent way of defending oneself.
+\Glspl{weapon} are a great way of inflicting additional Damage, and an equally excellent way of defending oneself.
 Having a longsword to keep scary opponents at bay is always better than trying to nimbly dodge about.
-Longer weapons grant an Attack Bonus, allowing someone to hit the enemy before the enemy hits them, and heavy weapons tend to deal more Damage.
+Longer \glspl{weapon} grant an Attack Bonus, allowing someone to hit the enemy before the enemy hits them, and heavy \glspl{weapon} tend to deal more Damage.
 However, both of these come at the cost of extra \emph{heft}; they take more time to swing, and so cost more \glspl{ap} to use.
 
-Each weapon has the following properties:
+Each \gls{weapon} has the following properties:
 
 \begin{itemize}
 
diff --git a/main.tex b/main.tex
index 212842e1b1153b01379f192cb2208940d606b06d..0281f7ebebb52a61dfa677d39e7f9c6a037e540c 100644
--- a/main.tex
+++ b/main.tex
@@ -64,6 +64,11 @@ Keywords={TTRPG,RPG,roleplaying}
 
 \startappendix
 
+\printglossary[
+  style=topicmcols,
+  type=mech,
+  ]
+
 \input{appendix.tex}
 
 \printindex