diff --git a/manual/appendix/config_file_options.tex b/manual/appendix/config_file_options.tex
index 117d6f90fe..87e8a2ab96 100644
--- a/manual/appendix/config_file_options.tex
+++ b/manual/appendix/config_file_options.tex
@@ -4,7 +4,7 @@
 % define a local version of endhead, as using the output distinction adds
 % an unwanted newline. endhead breaks with htlatex so we need to remove it
 % for the html output.
-\ifpdfoutput{\newcommand{\localendhead}{\endhead}}%
+\Ifpdfoutput{\newcommand{\localendhead}{\endhead}}%
     {\newcommand{\localendhead}{}}
   \rowcolors{2}{tbloddrowbgcolor}{tblevenrowbgcolor}
   \begin{longtable}{>{\raggedright}p{.3\textwidth}>{\raggedright}p{.4\textwidth}p{.2\textwidth}}
diff --git a/manual/frontpage/frontpage.tex b/manual/frontpage/frontpage.tex
index 1b451d5cbb..d343d4cf0c 100644
--- a/manual/frontpage/frontpage.tex
+++ b/manual/frontpage/frontpage.tex
@@ -1,7 +1,7 @@
 \thispagestyle{empty}
 \vspace*{0.3cm}
 \begin{center}
-\ifpdfoutput{\includegraphics[width=10cm]{frontpage/rockboxlogo.pdf}}
+\Ifpdfoutput{\includegraphics[width=10cm]{frontpage/rockboxlogo.pdf}}
 {\includegraphics{frontpage/rockbox-web.png}}\\
 \vspace{2cm}
 \huge{\textsf{\textbf{The Rockbox Manual\\for\\\playername}}}\vspace{1cm}\\
diff --git a/manual/getting_started/main.tex b/manual/getting_started/main.tex
index f5eba1fae8..4d1798a4c7 100644
--- a/manual/getting_started/main.tex
+++ b/manual/getting_started/main.tex
@@ -65,7 +65,7 @@ unsupported''. Manufacturer and model names are proper nouns, and
 thus are written beginning with a capital letter.
 
 % write a bit more about names etc. here.
-\ifpdfoutput{
+\Ifpdfoutput{
 This manual has some parts that are marked with icons on the margin to help
 you finding important parts or parts you could skip. The following icons
 are used:
@@ -91,14 +91,14 @@ are used:
   icon shown in the margin on the right.
 \\
 }
-}{}% end ifpdfoutput
+}{}% end Ifpdfoutput
 
 Links to the wiki are abbreviated by the name of the wiki page. Those names
 are still linked so you can simply follow them like any other link in this
 manual. If you want to access a wiki page manually go to
 \wikiicon{} \href{\wikibaseurl}{\wikibaseurl}
 and type the page name in the ``Go'' box at the top of the page.
-\ifpdfoutput{Links to wiki pages are also indicated by the symbol \wikiicon{}
+\Ifpdfoutput{Links to wiki pages are also indicated by the symbol \wikiicon{}
 in front of the page name.}{}
 
 \input{getting_started/installation.tex}
diff --git a/manual/intro/main.tex b/manual/intro/main.tex
index 13b15a0ed5..ef091e4550 100644
--- a/manual/intro/main.tex
+++ b/manual/intro/main.tex
@@ -18,11 +18,11 @@
 % Contributors are listed in the file docs/CREDITS-MANUAL
 %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\ifpdfoutput{
+\Ifpdfoutput{
 \newcommand{\latexbuild}{pdf\LaTeX}}
 {\newcommand{\latexbuild}{\TeX4ht}}
 
-\ifpdfoutput{\chapter*{\centering{Rockbox\\}}}%
+\Ifpdfoutput{\chapter*{\centering{Rockbox\\}}}%
 {\begin{center}{\Large{Rockbox}}\end{center}}
 
 \vspace{1cm}
diff --git a/manual/preamble.tex b/manual/preamble.tex
index 08d1f0dc0a..4fc5f2be10 100644
--- a/manual/preamble.tex
+++ b/manual/preamble.tex
@@ -76,7 +76,7 @@
 \usepackage{makeidx}
 \usepackage{fancyvrb}
 \usepackage{color}
-\ifpdfoutput{\usepackage{booktabs}}%
+\Ifpdfoutput{\usepackage{booktabs}}%
   {\newcommand{%
     \toprule}{}\newcommand{\midrule}{\hline}\newcommand{\bottomrule}{}%
   }
@@ -90,7 +90,7 @@
 % pdf output: try pdf first, then png and jpg as file format
 % html output: try png first, then jpg. Ignore pdf files
 % this only applies if no file extension is given!
-\ifpdfoutput{\DeclareGraphicsExtensions{.pdf,.png,.jpg}}%
+\Ifpdfoutput{\DeclareGraphicsExtensions{.pdf,.png,.jpg}}%
     {\DeclareGraphicsExtensions{.png,.jpg}}
 
 % fancy header style adjustments
@@ -107,7 +107,7 @@
 \setlength{\headheight}{18.5pt}
 \newcounter{example}[chapter]
 
-\ifpdfoutput{%
+\Ifpdfoutput{%
   \renewcommand{\toprule}{\specialrule{\heavyrulewidth}{\abovetopsep}{0pt}}
   \renewcommand{\midrule}{\specialrule{\lightrulewidth}{0pt}{\belowrulesep}}
   }{}
@@ -198,7 +198,7 @@
 % command to display a note.
 % Usage: \note{text of your note}
 % Note: do NOT use \textbf or similar to emphasize text, use \emph!
-\ifpdfoutput{
+\Ifpdfoutput{
 \newcommand{\note}[1]{
   \ifinner\else\vspace{1ex}\par\noindent\fi
   \textbf{Note:}\ %
@@ -209,7 +209,7 @@
 % command to display a warning.
 % Usage: \warn{text of your warning}
 % Note: do NOT use \textbf or similar to emphasize text!
-\ifpdfoutput{
+\Ifpdfoutput{
 \newcommand{\warn}[1]{
   \ifinner\else\par\noindent\fi
   \textbf{Warning:\ }%
@@ -219,7 +219,7 @@
 
 % command to mark a text block as intended especially for blind people
 % Usage: \blind{text}
-\ifpdfoutput{
+\Ifpdfoutput{
 \newcommand{\blind}[1]{\mbox{}\marginpar{\raisebox{-1ex}{\Huge{\ForwardToEnd}}}#1}
 }
 {\newcommand{\blind}[1]{\ifinner\else\par\noindent\fi#1}}
@@ -299,7 +299,7 @@
 % 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}}
+\Ifpdfoutput{\newcommand{\caps}[1]{\textsc{#1}}}{\usepackage{soul}}
 \newcommand{\setting}[1]{\caps{#1}}
 
 \newcommand{\config}[1]{\texttt{#1}}
@@ -314,7 +314,7 @@
 % Usage: \wikilink{WebHome}
 %        with "WebHome" being the wiki page name
 \newcommand{\wikibaseurl}{http://www.rockbox.org/wiki/}
-\ifpdfoutput{\newcommand{\wikiicon}{\Pointinghand}}
+\Ifpdfoutput{\newcommand{\wikiicon}{\Pointinghand}}
     {\newcommand{\wikiicon}{}}
 \newcommand{\wikilink}[1]{\wikiicon{}\href{\wikibaseurl#1}{#1}}
 %\newcommand{\wikilink}[1]{\url{http://www.rockbox.org/wiki/#1}}
@@ -355,15 +355,15 @@
 
 % Use the reference to handle get a flexible reference command
 % usage \reference{ref_section}
-\ifpdfoutput{%
+\Ifpdfoutput{%
   \newcommand{\reference}[1]{%
     section~\ref{#1} (page~\pageref{#1})%
 }}
 {\newcommand{\reference}[1]{section~\ref{#1}}}
 
 % special HTML output adjustments
-\ifpdfoutput{}{\setlength{\parindent}{0mm}}
-\ifpdfoutput{}{\renewcommand{\Forward}[1]{$\triangleright${}#1}}
+\Ifpdfoutput{}{\setlength{\parindent}{0mm}}
+\Ifpdfoutput{}{\renewcommand{\Forward}[1]{$\triangleright${}#1}}
 
 \newcommand{\btnfnt}[1]{\textbf{#1}}
 %\hfuzz=2pt
diff --git a/manual/rockbox_interface/main.tex b/manual/rockbox_interface/main.tex
index 27c6b56e8f..0f381ee58c 100644
--- a/manual/rockbox_interface/main.tex
+++ b/manual/rockbox_interface/main.tex
@@ -5,7 +5,7 @@
 
 % include the front image. Using \specimg makes this fairly easy,
 % but requires to use the exact value of \specimg in the filename!
-% The extension is selected in the preamble, so no further \ifpdfoutput
+% The extension is selected in the preamble, so no further \Ifpdfoutput
 % is necessary.
 %
 % The check looks for a png file -- we use png for the HTML manual, so that