diff --git a/Makefile b/Makefile
index 1f4ea18..f6b3cd5 100644
--- a/Makefile
+++ b/Makefile
@@ -9,7 +9,7 @@ pdf:
 
 bib:
 	bibtex thesis
-	pdf
+	makeindex thesis.glo -s thesis.ist -t thesis.glg -o thesis.gls
 
 
 puzzle:
diff --git a/latex_downloads/glossary.zip b/latex_downloads/glossary.zip
new file mode 100644
index 0000000..ee0adbe
Binary files /dev/null and b/latex_downloads/glossary.zip differ
diff --git a/thesis.tex b/thesis.tex
index 928f383..2a5dae1 100644
--- a/thesis.tex
+++ b/thesis.tex
@@ -10,6 +10,9 @@
 \usepackage{algorithm}
 \usepackage{algorithmic}
 \usepackage{lastpage}
+\usepackage{glossary}
+
+\makeglossary
 
 %% fix for hyperref bug in algorithm package
 \newcommand{\theHalgorithm}{\thechapter.\arabic{algorithm}}
@@ -198,13 +201,12 @@ Software documentation for fmmd tool.
 
 \chapter{A detailed look at the safety systems required by industrial burner controller}
 \input{burner/burner}
+\glossary{name={test glossary name}, description={test glossary entry description}}
 
-%\chapter{FMMD tool : Algorithms and Euler Diagram Parsing}
+\printglossary
+\addcontentsline{toc}{chapter}{Glossary}
 
-%\paragraph{bibliography}
-%\small
 \bibliographystyle{plain}
 \bibliography{vmgbibliography,mybib}
-%\normalsize
 
 \end{document}