diff --git a/hhuthesis.cls b/hhuthesis.cls
index 1757fd96111a646c14aefde9a4ee900feaefa8d4..3114972eea795533f6ae8581c725c563ec2ee501 100644
--- a/hhuthesis.cls
+++ b/hhuthesis.cls
@@ -156,10 +156,16 @@
   \let\section\appendix@section
 }
 \newcommand{\appendixpagename}{\iflanguage{ngerman}{Anhang}{Appendices}}
-\newcommand\appendix@section[1]{%
+\newcommand{\appendix@section}[2][\@nil]{%
   \refstepcounter{section}%
-  \orig@section*{\appendixname{}~\thesection\hspace{1em}#1}%
-  \addcontentsline{toc}{section}{\appendixname{}~\thesection\hspace{1em}#1}%
+  \orig@section*{\thesection\hspace{1em}#2}%
+  \def\tmp{#1}%
+  \ifx\tmp\@nnil% % Puts the optional short title into the ToC if not empty
+    \addcontentsline{toc}{section}{\appendixname{}~\thesection\hspace{1em}#2}%
+  \else%
+    \addcontentsline{toc}{section}{\appendixname{}~\thesection\hspace{1em}#1}%
+  \fi%
+  \markboth{\thesection\hspace{1em}\MakeUppercase{#2}}{}%
 }
 \let\orig@section\section