diff --git a/docs/datasheet/content/hwloop.tex b/docs/datasheet/content/hwloop.tex
index 0bddec83..2faefbe2 100644
--- a/docs/datasheet/content/hwloop.tex
+++ b/docs/datasheet/content/hwloop.tex
@@ -175,7 +175,6 @@ given as an immediate.
 
 \begin{table}[H]
  \caption{Control and Status Register Map}
- \label{tab:csr_map}
  \centering\begin{tabularx}{\linewidth}{@{}|cc|c|l|l|X|@{}} \toprule
    \multicolumn{2}{|c|}{\textbf{CSR Address}} & \textbf{Hex} & \textbf{Name} & \textbf{Access}  & \textbf{Description} \\ \hline
    \textbf{[11:6]} & \textbf{[5:0]} & & & & \\ \toprule
diff --git a/docs/datasheet/content/title.tex b/docs/datasheet/content/title.tex
new file mode 100644
index 00000000..d4d07219
--- /dev/null
+++ b/docs/datasheet/content/title.tex
@@ -0,0 +1,28 @@
+\makeatletter
+\begin{titlepage}
+
+ % Remove the page number in the footer.
+ \thispagestyle{empty}
+
+ \begin{center}
+
+  \begin{spacing}{2.0}
+  {\Huge\textbf{\@title}}
+  \end{spacing}
+
+  \vspace{0.2cm}
+
+  \vfill
+
+  \includegraphics[height = 8cm]{figures/ri5cy_overview}
+
+  \vfill
+
+  {\Large \@author}\\
+  {atraber@iis.ee.ethz.ch}
+  \vfill
+  \@date
+
+ \end{center}
+\end{titlepage}
+\makeatother
diff --git a/docs/datasheet/datasheet.tex b/docs/datasheet/datasheet.tex
index bf8da1a8..f36aa660 100644
--- a/docs/datasheet/datasheet.tex
+++ b/docs/datasheet/datasheet.tex
@@ -18,6 +18,7 @@
 
 %%%%% Mandatory title page settings.
 \title{RI5CY Core: Datasheet}
+\author{Andreas Traber}
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%%%%                                                                 %
@@ -26,7 +27,7 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \begin{document}
 
-\maketitle
+\input{./content/title.tex}
 
 \tableofcontents