diff --git a/.travis.yml b/.travis.yml
index 75cc0184..7ca5e423 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -37,6 +37,7 @@ before_install:
 
 # Attempt to create a PDF
 script:
+  - make help
   - make pdf
   - cat pandoc.log
   - make html
diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 00000000..4fbfd65b
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,26 @@
+FROM pandoc/ubuntu-latex
+
+RUN tlmgr update --self \
+    && tlmgr install truncate \
+    && tlmgr install tocloft \
+    && tlmgr install wallpaper \
+    && tlmgr install morefloats \
+    && tlmgr install sectsty \
+    && tlmgr install siunitx \
+    && tlmgr install threeparttable \
+    && tlmgr install makecell \
+    && tlmgr update l3packages \
+    && tlmgr update l3kernel \
+    && tlmgr update l3experimental
+
+RUN apt-get update \
+    && apt-get install -y python3 python3-pip pandoc-citeproc \
+    && rm -rf /var/lib/apt/lists/*
+
+RUN pip3 install \
+    pandoc-fignos \
+    pandoc-eqnos \
+    pandoc-tablenos \
+    pandoc-secnos \
+    pandoc-shortcaption \
+    fabric
diff --git a/Makefile b/Makefile
index bc995665..9d843d6e 100644
--- a/Makefile
+++ b/Makefile
@@ -10,20 +10,26 @@ SCRATCHDIR=$(BASEDIR)/scratch
 
 BIBFILE=$(INPUTDIR)/references.bib
 
+DOCKER_TAG=phd_thesis_markdown
+
 help:
-	@echo ' 																	  '
-	@echo 'Makefile for the Markdown thesis                                       '
-	@echo '                                                                       '
-	@echo 'Usage:                                                                 '
-	@echo '   make install                     install pandoc plugins
-	@echo '   make html                        generate a web version
-	@echo '   make pdf                         generate a PDF file  			  '
-	@echo '   make docx	                       generate a Docx file 			  '
-	@echo '   make tex	                       generate a Latex file 			  '
-	@echo ' 																	  '
-	@echo ' 																	  '
-	@echo 'get local templates with: pandoc -D latex/html/etc	  				  '
-	@echo 'or generic ones from: https://github.com/jgm/pandoc-templates		  '
+	@echo ''
+	@echo 'Makefile for the Markdown thesis'
+	@echo ''
+	@echo 'Usage:'
+	@echo '   make docker                      build docker image "$(DOCKER_TAG)"'
+	@echo '   make install                     install pandoc plugins'
+	@echo '   make html                        generate a web version'
+	@echo '   make pdf                         generate a PDF file'
+	@echo '   make docx                        generate a Docx file'
+	@echo '   make tex                         generate a Latex file'
+	@echo ''
+	@echo ''
+	@echo 'get local templates with: pandoc -D latex/html/etc'
+	@echo 'or generic ones from: https://github.com/jgm/pandoc-templates'
+
+docker:
+	docker build --tag "$(DOCKER_TAG)" .
 
 install:
 	sh $(BASEDIR)/install.sh
@@ -89,4 +95,4 @@ html:
 	cp -r "$(INPUTDIR)/figures" "$(OUTPUTDIR)/source/figures"
 
 
-.PHONY: help install pdf docx html tex
+.PHONY: help docker install pdf docx html tex