2 files changed, 8 insertions, 3 deletions

diff --git a/manual/appendix/appendix.tex b/manual/appendix/appendix.tex
index c94ca878b9..e15232bb56 100644
--- a/manual/appendix/appendix.tex
+++ b/manual/appendix/appendix.tex
@@ -123,7 +123,7 @@ Changes in version 2.5
 People that have contributed to the project, one way or another. Friends!
 %
 \begin{multicols}{2}
-\noindent\textsc{\small{\input{CREDITS.tex}}}
+\noindent\caps{\small{\input{CREDITS.tex}}}
 \end{multicols}
 
 \chapter{Licenses}
diff --git a/manual/preamble.tex b/manual/preamble.tex
index 3ac9edcf0e..ca8926758d 100644
--- a/manual/preamble.tex
+++ b/manual/preamble.tex
@@ -21,7 +21,8 @@
 
 \documentclass[a4paper,11pt]{scrreprt}
 \usepackage[utf8x]{inputenc}
-\usepackage{palatino}
+% This manual used to use Palatino as font. This caused issues with small caps
+% (textsc), so do not use that font as default one anymore.
 
 \usepackage{tabularx}
 \usepackage{multirow}
@@ -243,7 +244,11 @@
   \endtabularx
 }
 
-\newcommand{\setting}[1]{\textsc{#1}}
+% When creating HTML, use the soul package.
+% This produces much nicer HTML code (textsc results in each character being
+% put in a separate <span>).
+\ifpdfoutput{\newcommand{\caps}[1]{\textsc{#1}}}{\usepackage{soul}}
+\newcommand{\setting}[1]{\caps{#1}}
 
 \newcommand{\config}[1]{\texttt{#1}}