diff --git a/Makefile b/Makefile
index b2d093b..de23d2f 100755
--- a/Makefile
+++ b/Makefile
@@ -18,6 +18,7 @@ tex: $(TEXFILE).tex
 	@test -d $(TMPDIR) || mkdir $(TMPDIR)
 	@echo "Running 2 compiles $(TMPDIR)"
 	@pdflatex -output-directory=$(TMPDIR) -interaction=batchmode -file-line-error -no-shell-escape $< > /dev/null
+	@makeglossaries -d $(TMPDIR) $(TEXFILE)
 	@pdflatex -output-directory=$(TMPDIR) -interaction=batchmode -file-line-error -no-shell-escape $< > /dev/null
 	@cp $(TMPDIR)/$(TEXFILE).pdf .
 	@echo $(FIRSTTAG) > version
diff --git a/glossaries.tex b/glossaries.tex
new file mode 100644
index 0000000..e2e7c20
--- /dev/null
+++ b/glossaries.tex
@@ -0,0 +1,18 @@
+\makeglossaries
+
+\renewcommand*{\glspostdescription}{}
+
+%%% Acronyms
+\newacronym{IPR}{IPR}{Intellectual Property Rights}
+\newacronym{SIG}{SIG}{Special Integration Work Group}
+\newacronym{TWG}{TWG}{Technical Work Group}
+
+\newacronym{BMC}{BMC}{Baseboard Management Controller}
+\newacronym{OCP}{OCP}{Open Compute Project}
+\newacronym{DC-SCM}{DC-SCM}{Datacenter Secure Control Module}
+\newacronym{ISA}{ISA}{Instruction Set Architecture}
+\newacronym{RTL}{RTL}{Register-Transfer-Level}
+\newacronym{PDK}{PDK}{Process Design Kit}
+\newacronym{FPGA}{FPGA}{Field Programmable Gate Arrays}
+\newacronym{LSB}{LSB}{Linux Standard Base}
+\newacronym{OS}{OS}{Open Source}