diff --git a/xml2xslt.xsl b/xml2xslt.xsl
index 535ceae..71bf59c 100644
--- a/xml2xslt.xsl
+++ b/xml2xslt.xsl
@@ -204,11 +204,16 @@
                     <xsl-out:value-of select="$latex-hyperref-boilerplate" />
 
 					<xsl-out:text>
-\defaultfontfeatures{Mapping=tex-text}
-\setmainfont{Minion Pro}
-\setsansfont[Scale=MatchUppercase,BoldFont={Open Sans}]{Open Sans Light}
+% The following line is equivalent to:
+%   \setmainfont{Minion Pro}
+%   \setmathsfont(Latin,Digits){Minion Pro}
+%   \setmathrm{Minion Pro}
+\setprimaryfont[Mapping=tex-text]{Minion Pro}
+\setsansfont[Mapping=tex-text, Scale=MatchUppercase, BoldFont={Open Sans}]{Open Sans Light}
+% Explicitly specify Mapping=tex-text only for the primary and sans fonts,
+% otherwise curly quotes will automatically appear in the mono font. Since
+% this is pretty much exclusively used for code listings, this is a bad thing.
 \setmonofont[Scale=MatchLowercase]{Letter Gothic 12 Pitch}
-\setmathsfont(Latin,Digits){TeX Gyre Pagella}
 
 % Hack to prevent digits in hyperlinks from being set in the main font instead of the mono font.
 % From http://tex.stackexchange.com/questions/99770/problem-with-digits-in-urls-when-using-mathspec-and-hyperref