diff --git a/src/site/markdown/download.md b/src/site/markdown/download.md
index 29d7fdbdb8542a9a7938e061de5008cc21185d73..f32cea0bdbe7cf9fd5cb61827889f4677b05193f 100644
--- a/src/site/markdown/download.md
+++ b/src/site/markdown/download.md
@@ -26,7 +26,7 @@ For other project management tools, please check [here](nomaven.html).
 
 #### Binaries and sources
 
-The latest TeeTime release can be downloaded directly from [Sourceforge](https://sourceforge.net/projects/teetime/files/latest/download). If you also want to download the source and/or JavaDoc, you can also get a summary of available files on [Sourceforge](https://sourceforge.net/projects/teetime/files/) or [the Central Repository](http://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22net.sourceforge.teetime%22%20AND%20a%3A%22teetime%22).
+The latest TeeTime release can be downloaded directly from [GitHub](https://github.com/teetime-framework/teetime/releases/latest) where also the JavaDoc and the sources are available. A summary of available files, such as older versions, can be found on [the Central Repository](http://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22net.sourceforge.teetime%22%20AND%20a%3A%22teetime%22) or also on [GitHub](https://github.com/teetime-framework/teetime/releases).
 
 ## Snapshot
 
diff --git a/src/site/site.xml b/src/site/site.xml
index ae53089762f6d94577f10ad430f7c250308c17f4..acd4bcf81e567bbda3bc10b37e6147d0f61736bc 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -7,10 +7,10 @@
 	<bannerLeft>
 		<name>
 			<![CDATA[
-					<img src="http://christianwulf.github.io/teetime/images/teetime-path.svg" id="logo">
+					<img src="http://teetime-framework.github.io/images/teetime-path.svg" id="logo">
 					]]>
 		</name>
-		<href>http://christianwulf.github.io/teetime/</href>
+		<href>http://teetime-framework.github.io/</href>
 	</bannerLeft>
 	<poweredBy>
 		<logo name="Maven" href="http://maven.apache.org/"
@@ -61,7 +61,7 @@
 		</menu>
 		<menu name="Get Involved">
 			<item name="Contribute" href="contribute.html" />
-			<item name="Visit us on GitHub" href="https://github.com/ChristianWulf/teetime/" />
+			<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" />
 			<item name="Team" href="team-list.html" />
@@ -82,7 +82,7 @@
 			<topNav>News|Download|Wiki|Documentation|Get Involved</topNav>
 			<!-- <toc>sidebar</toc> -->
 			<!-- <tocTopMax>4</tocTopMax> -->
-			<absoluteResourceURL>http://christianwulf.github.io/teetime/
+			<absoluteResourceURL>http://teetime-framework.github.io/
 			</absoluteResourceURL>
 			<theme>default</theme>
 			<highlightJs>true</highlightJs>
@@ -91,7 +91,7 @@
 				<name>
 					TeeTime
 				</name>
-				<href>http://christianwulf.github.io/teetime/</href>
+				<href>http://teetime-framework.github.io/</href>
 			</brand>
 			<slogan>
 				<![CDATA[