diff --git a/make-includes/standard_environment.make b/make-includes/standard_environment.make
index f786ecb..fff2758 100644
--- a/make-includes/standard_environment.make
+++ b/make-includes/standard_environment.make
@@ -35,6 +35,14 @@
 LATEX_OPTS+=,
 endif
 LATEX_OPTS+=$(FONT_SIZE),$(PAPER_SIZE),$(DRAFT)
+
+# LaTeX doesn't like white space in document class options (it basically stops
+# when it hits the first occurrence), so we need to strip these out. Unfortunately
+# this is (as many things) inordinately difficult to do within make, so let's
+# just drop out to the shell and use tr. Note use of := to avoid recursive
+# expansion.
+LATEX_OPTS:=$(shell echo "$(LATEX_OPTS)" | tr -d ' ')
+
 #
 # List of standard "phony" build targets.
 #