diff --git a/server.py b/server.py
index 852d555dadf27bded9f550b5bb411c089655012a..7ecee0c681763853e949ac06129d33cc0216aceb 100644
--- a/server.py
+++ b/server.py
@@ -57,7 +57,8 @@ if config['DEBUG']:
 
 # get git commit
 import subprocess
-app.jinja_env.globals['gitversion'] = subprocess.check_output(['git', "log", "-g", "-1", "--pretty=%H # %h # %d # %s"]).decode('UTF-8').split('#')
+output = subprocess.check_output(['git', "log", "-g", "-1", "--pretty=%H # %h # %d # %s"]).decode('UTF-8').split('#')
+app.jinja_env.globals['gitversion'] = { 'hash': output[1], 'longhash': output[0], 'branch': output[2], 'msg': output[3]  }
 
 if not config.get('SECRET_KEY', None):
 	config['SECRET_KEY'] = os.urandom(24)
diff --git a/templates/base.html b/templates/base.html
index 08b7add1eb37f57d41188fc07d53562354d9f399..d62d543ff99ed819448919da2cb0d7ce8f661fe3 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -147,7 +147,7 @@
 					</li>
 					{% if ismod() or config.DEBUG %}
 					<li class="pull-right">
-						<a target="_blank" href="https://git.fsmpi.rwth-aachen.de/videoagwebsite/videoagwebsite/commit/{{ gitversion[0] }}"><span title="{{ gitversion[2] }} {{ gitversion[1] }}: {{ gitversion[3] }}" data-toggle="tooltip">{{ gitversion[1] }}</span></a>
+						<a target="_blank" href="https://git.fsmpi.rwth-aachen.de/videoagwebsite/videoagwebsite/commit/{{ gitversion.longhash }}"><span title="{{ gitversion.branch }} {{ gitversion.hash }}: {{ gitversion.msg }}" data-toggle="tooltip">{{ gitversion.hash }}</span></a>
 						<span>{{ gethostname() }}</span>
 					</li>
 					{% endif %}