diff --git a/src/site/site.xml b/src/site/site.xml
index 7271f1e30527710682d7ee05180c8565905e945c..945201bf03425f5d8da5dacd8e8e4da097e9ea7e 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -62,7 +62,7 @@
 			<item name="Contribute" href="contribute.html" />
 			<item name="Visit us on GitHub" href="https://github.com/teetime-framework/teetime" />
 			<item name="Issue Tracking"
-				href="https://build.se.informatik.uni-kiel.de/gitlab/chw/teetime/issues" />
+				href="https://build.se.informatik.uni-kiel.de/gitlab/teetime/teetime/issues" />
 			<item name="Team" href="team-list.html" />
 		</menu>
 		<menu name="Main">
@@ -112,7 +112,7 @@
 				<a href="https://build.se.informatik.uni-kiel.de/jenkins/view/TeeTime/job/teetime-nightly-release/lastCompletedBuild/testReport/"><img alt="Jenkins build status" src="https://img.shields.io/jenkins/t/https/build.se.informatik.uni-kiel.de/jenkins/view/TeeTime/teetime-nightly-release.svg?style=flat-square"></a>
 				<br /><br />Stable state:
 				<br />
-				<a href="https://github.com/teetime-framework/teetime/releases/latest" rel="nofollow"><img alt="Download TeeTime" src="https://img.shields.io/badge/GitHub-v2.0-brightgreen.svg?style=flat-square"></a>
+				<a href="https://github.com/teetime-framework/teetime/releases/latest" rel="nofollow"><img alt="Download TeeTime" src="https://img.shields.io/github/release/teetime-framework/teetime.svg?style=flat-square"></a>
 				<br />
 				<a href="http://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22net.sourceforge.teetime%22%20AND%20a%3A%22teetime%22"><img alt="Download TeeTime" src="https://img.shields.io/maven-central/v/net.sourceforge.teetime/teetime.svg?style=flat-square"></a>
 				]]>