diff --git a/cleanthesis.sty b/cleanthesis.sty
index c1cdbe1..75cde28 100644
--- a/cleanthesis.sty
+++ b/cleanthesis.sty
@@ -92,6 +92,10 @@
 \define@choicekey*[ct]{cthesis}{bibstyle}[\val\bibstylenr]{alphabetic,numeric,authoryear}[alphabetic]{\def\cthesis@bibstyle{#1}}
 \setkeys[ct]{cthesis}{bibstyle=alphabetic}
 
+% OPTION wrapfooter
+% --> values = true|false
+\define@boolkey[ct]{cthesis}{wrapfooter}[false]{}
+\setkeys[ct]{cthesis}{wrapfooter=false}
 
 \DeclareOptionX*{
 	\PackageWarning{cleanthesis}{Unknown option ‘\CurrentOption’}%
@@ -361,7 +365,11 @@
 		\footnotesize%
 		{\color{ctcolorfootermark}\textbf{\chaptername\ \thechapter}}%
 		\quad%
-		{\color{ctcolorfootertitle}#1}%
+		\ifct@cthesis@wrapfooter%
+			{\color{ctcolorfootertitle}\parbox[t]{.7\textwidth}{#1}}%
+		\else%
+			{\color{ctcolorfootertitle}#1}%
+		\fi%
 	}{}%
 }
 \renewcommand{\sectionmark}[1]{%
diff --git a/doc/cleanthesis-doc.pdf b/doc/cleanthesis-doc.pdf
index 3693226..13cd2f0 100644
Binary files a/doc/cleanthesis-doc.pdf and b/doc/cleanthesis-doc.pdf differ
diff --git a/doc/cleanthesis-doc.tex b/doc/cleanthesis-doc.tex
index 6c44771..e69f048 100644
--- a/doc/cleanthesis-doc.tex
+++ b/doc/cleanthesis-doc.tex
@@ -205,6 +205,10 @@ Sets whether to use an \texttt{alphabetic}, a \texttt{numeric}, or an \texttt{au
 For further information please check out the biblatex documentation\footnote{\url{http://www.ctan.org/pkg/biblatex}}.
 The default is \texttt{alphabetic}.
 
+\boolitem[false]{wrapfooter}
+
+Sets whether to wrap the name of a chapter in the footer or not.
+
 \end{optionlist}
 
 \end{document}
diff --git a/my-thesis-setup.tex b/my-thesis-setup.tex
index 0831f1c..cdf838e 100644
--- a/my-thesis-setup.tex
+++ b/my-thesis-setup.tex
@@ -1,4 +1,4 @@
-% !TEX root = thesis-example.tex
+% !TEX root = my-thesis.tex
 
 
 % **************************************************
@@ -58,6 +58,7 @@
     bibsys=bibtex,%
     bibfile=bib-refs,%
     bibstyle=alphabetic,%
+    wrapfooter=false,%
 }{cleanthesis}
 \usepackage{cleanthesis}
 
diff --git a/my-thesis.pdf b/my-thesis.pdf
index b028f8b..9db8630 100644
Binary files a/my-thesis.pdf and b/my-thesis.pdf differ