diff --git a/.github/workflows/nist-docs.yml b/.github/workflows/nist-docs.yml
index b19c218..008f479 100644
--- a/.github/workflows/nist-docs.yml
+++ b/.github/workflows/nist-docs.yml
@@ -11,6 +11,7 @@ jobs:
         with:
           apt-packages: |-
              doxygen
+             latexmk
           build-pdf-command: make pdf
           docs-folder: doc/
           formats: |-
diff --git a/doc/Makefile b/doc/Makefile
index efd12b8..0f96e9e 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -1,22 +1,18 @@
 # Makefile for HiPerC documentation
 
-LATEX = pdflatex
-SPHINX = sphinx-build
-DOXYGEN = doxygen
-
 all: pdf
 .PHONY: all
 
 .PHONY: dox
 dox:
-	$(DOXYGEN)
+	doxygen
 
 .PHONY: tex
 tex: dox
 	$(MAKE) -C latex && \
 	cd latex && \
 	cp refman.tex hiperc.tex && \
-	$(LATEX) hiperc.tex
+	latexmk hiperc.tex
 
 .PHONY: pdf
 pdf: tex
@@ -24,7 +20,7 @@ pdf: tex
 
 .PHONY: html
 html: dox
-	$(SPHINX) -b html . _build
+	sphinx-build -b html . _build
 
 .PHONY: clean
 clean:
diff --git a/doc/conf.py b/doc/conf.py
index 15ad766..4c9ce16 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -78,7 +78,7 @@
 #
 # This is also used if you do content translation via gettext catalogs.
 # Usually you set "language" from the command line for these cases.
-language = None
+language = "en"
 
 # List of patterns, relative to source directory, that match files and
 # directories to ignore when looking for source files.
@@ -162,7 +162,7 @@
 # (source start file, target name, title,
 #  author, documentclass [howto, manual, or own class]).
 latex_documents = [
-    (master_doc, "HiPerC.tex", u"HiPerC Documentation", u"Trevor Keller", "manual")
+    (master_doc, "hiperc.tex", u"HiPerC Documentation", u"Trevor Keller", "manual")
 ]
 
 
diff --git a/doc/hiperc_guide.pdf b/doc/hiperc_guide.pdf
index 6ce4ad9..b2d9377 100644
Binary files a/doc/hiperc_guide.pdf and b/doc/hiperc_guide.pdf differ