diff --git a/doc/generic/pgf/macros/pgfmanual-en-macros.tex b/doc/generic/pgf/macros/pgfmanual-en-macros.tex
index c326d973e..a53537a99 100644
--- a/doc/generic/pgf/macros/pgfmanual-en-macros.tex
+++ b/doc/generic/pgf/macros/pgfmanual-en-macros.tex
@@ -440,7 +440,7 @@
   \removeats{#1}%
   \pgfmanualentryheadline{%
     \pgfmanualpdflabel{\textbackslash\strippedat}{}%
-    \declare{\texttt{\string#1}}#2%
+    \declare{\expandafter\texttt\expandafter{\string#1}}#2%
   }%
   \index{\strippedat @\protect\myprintocmmand{\strippedat}}
 }
diff --git a/doc/generic/pgf/text-en/pgfmanual-en-main-preamble.tex b/doc/generic/pgf/text-en/pgfmanual-en-main-preamble.tex
index 6debf3ff2..8c73417a4 100644
--- a/doc/generic/pgf/text-en/pgfmanual-en-main-preamble.tex
+++ b/doc/generic/pgf/text-en/pgfmanual-en-main-preamble.tex
@@ -167,6 +167,11 @@
   % pgfmanual-en-macros.tex defines an environment named filedescription
   \let\filedescription\relax
   \usepackage[utf8]{luainputenc}
+  % dvisvgm does not support OpenType fonts so we have to bite the bullet and
+  % use T1 where quotes are weird.  In LuaTeX \outputmode=0 means DVI.
+  \ifnum\outputmode=0
+    \usepackage[T1]{fontenc}
+  \fi
 \else
   \usepackage[utf8]{inputenc}
   \usepackage[T1]{fontenc}