diff --git a/doc/Makefile b/doc/Makefile
index ff56226e83..4f20ab3453 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -12,6 +12,7 @@ PYTHON        = $(shell which python3)
 VIRTUALENV     = virtualenv
 HAS_PYTHON3    = NO
 HAS_VIRTUALENV = NO
+HAS_PDFLATEX   = NO
 
 ifeq ($(shell which python3 >/dev/null 2>&1; echo $$?), 0)
 HAS_PYTHON3 = YES
@@ -27,6 +28,11 @@ VIRTUALENV     = virtualenv
 HAS_VIRTUALENV = YES
 endif
 
+ifeq ($(shell which pdflatex >/dev/null 2>&1; echo $$?), 0)
+HAS_PDFLATEX = YES
+endif
+
+
 SPHINXEXTRA = -j $(shell $(PYTHON) -c 'import multiprocessing;print(multiprocessing.cpu_count())')
 
 .PHONY: help clean-all clean clean-spelling epub mobi rst html pdf spelling anchor_check style_check
@@ -113,6 +119,7 @@ mobi: epub
 	@echo "Conversion finished. The MOBI manual file is created."
 
 pdf: $(ANCHORCHECK)
+	@if [ "$(HAS_PDFLATEX)" == "NO" ] ; then echo "PDFLaTeX was not found! Please check README.md for further instructions" 1>&2; exit 1; fi
 	@(\
 		cd src/Developer; \
 		pdflatex developer; \
@@ -187,6 +194,7 @@ $(VENV):
 	@( \
 		$(VIRTUALENV) -p $(PYTHON) $(VENV); \
 		. $(VENV)/bin/activate; \
+		pip install --upgrade pip; \
 		pip install Sphinx; \
 		deactivate;\
 	)
diff --git a/doc/README b/doc/README
index 1416584eed..1c6e982786 100644
--- a/doc/README
+++ b/doc/README
@@ -99,6 +99,12 @@ to be installed (e.g. from texlive):
 - hyperref
 - hypcap
 - times
+- tabulary
+- framed
+- wrapfig
+- upquote
+- capt-of
+- needspace
 ----------------
 
 Installing prerequisites for epub build
diff --git a/tools/singularity/README.md b/tools/singularity/README.md
index 15c4ffe4b4..14f73f8060 100644
--- a/tools/singularity/README.md
+++ b/tools/singularity/README.md
@@ -46,7 +46,7 @@ make
 
 | Currently available:           | Description                                    |
 | ------------------------------ | ---------------------------------------------- |
-| centos7.def                    | CentOS 7.x with EPEL enabled                   |
+| centos7.def                    | CentOS 7.x with EPEL enabled, no LaTeX         |
 | centos8.def                    | CentOS 8.x with EPEL enabled                   |
 | fedora30_mingw.def             | Fedora 30 with MinGW cross-compiler toolchain  |
 | ubuntu16.04.def                | Ubuntu 16.04LTS with default MPI == OpenMPI    |