diff --git a/fi-thesis-report.cls b/fi-thesis-report.cls
index 8a4cf46560ca349394ae887b059f971404901eb4..7774a9e81bb302604babed1921116db054ddba18 100644
--- a/fi-thesis-report.cls
+++ b/fi-thesis-report.cls
@@ -101,5 +101,5 @@ Autor práce: & \@student
 \AtEndDocument{
 \vspace{2em}
 \noindent
-Brno \today \hfill \@signature
+Brno \@date \hfill \@signature
 }
diff --git a/pandoc/template.tex b/pandoc/template.tex
index 670bf7dec608df7a706c5f132e0dc906106e044d..f5ffeb81e570453b4e680fb71ec7a6fffd81b03f 100644
--- a/pandoc/template.tex
+++ b/pandoc/template.tex
@@ -13,6 +13,7 @@ $if(consultant)$\setConsultant{$consultant$}$endif$
 $if(reader)$\setReader{$reader$}$endif$
 $if(inter-reader)$\setInterReader{$inter-reader$}$endif$
 $if(signature)$\setSignature{$signature$}$endif$
+$if(date)$\date{$date$}$endif$
 
 $for(header-includes)$
 $header-includes$
diff --git a/pandoc/thesis-report.md b/pandoc/thesis-report.md
index 1713f261b00685c94dc72b00334e8c3baa82434f..cdbc81e6cc1fb908457597c975698515f077d75f 100644
--- a/pandoc/thesis-report.md
+++ b/pandoc/thesis-report.md
@@ -9,6 +9,9 @@ consultant: Ing. Maggie Lane         # comment to hide
 reader: RNDr. John Smith             # comment to hide
 inter-reader: RNDr.\ Mary Poppins, Ph.D.    # comment to hide
 #signature: John Smith               # uncomment for custom signature
+#date: 1\. 4. 2020                   # uncomment for custom date
+# Note: Escaping the the first '.' via '\.' is necessary, otherwise pandoc
+#       gets confused and assumes this is an enumerated list.
 header-includes:
     - \usepackage{lipsum}
 ...
diff --git a/thesis-report.tex b/thesis-report.tex
index 75c9fc8b3678c0ad675438c0e432c123fce7d852..78a604be9f18335a125789d7fa9bad4096d5435b 100644
--- a/thesis-report.tex
+++ b/thesis-report.tex
@@ -22,6 +22,9 @@
 % If signature is not set, supervisor/reader name is taken.
 \setSignature{John Smith}
 
+% OPTIONAL: Set the date using \date{...}.
+% If the date is not set, uses \today.
+
 % Thesis report begin
 \begin{document}