diff --git a/pom.xml b/pom.xml
index d6b8981a29c3922c1190b252166607f6137b8484..81128448cbfde020c8303b4ca3881eb266c121ed 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,13 +9,13 @@
 
 	<name>TeeTime</name>
 	<description>TeeTime is a Pipe-and-Filter framework for Java</description>
-	<url>http://teetime.sourceforge.org</url>
+	<url>http://christianwulf.github.io/teetime/</url>
 	<inceptionYear>2015</inceptionYear>
 
 	<licenses>
 		<license>
 			<name>Apache License, Version 2.0</name>
-			<url>http://teetime.sourceforge.net/LICENSE.txt</url>
+			<url>http://christianwulf.github.io/teetime/LICENSE.txt</url>
 		</license>
 	</licenses>
 
diff --git a/src/site/markdown/wiki b/src/site/markdown/wiki
new file mode 160000
index 0000000000000000000000000000000000000000..76a62dcf658beff5cbb6cd8145b50b7714d8ef3c
--- /dev/null
+++ b/src/site/markdown/wiki
@@ -0,0 +1 @@
+Subproject commit 76a62dcf658beff5cbb6cd8145b50b7714d8ef3c
diff --git a/src/site/site.xml b/src/site/site.xml
index 25d1340c5b72b72385c394707af69c49a6566b2d..534be27fbd7a2f05e3909b524d86619b32c4defc 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -8,10 +8,10 @@
 	<bannerLeft>
 		<name>
 			<![CDATA[
-					<img src="http://teetime.sourceforge.net/images/teetime-path.svg" id="logo">
+					<img src="http://christianwulf.github.io/teetime/images/teetime-path.svg" id="logo">
 					]]>
 		</name>
-		<href>http://teetime.sourceforge.net</href>
+		<href>http://christianwulf.github.io/teetime/</href>
 	</bannerLeft>
 	<poweredBy>
 		<logo name="Maven" href="http://maven.apache.org/"
@@ -54,7 +54,7 @@
 			<item name="Wiki" href="wiki/" />
 		</links>
 		<menu name="Documentation">
-			<item name="JavaDoc" href="stabledocs/index.html" />
+			<item name="JavaDoc" href="http://teetime.sourceforge.net/stabledocs/index.html" />
 			<item name="Release Notes" href="changes-report.html" />
 			<item name="Project Dependencies" href="dependencies.html" />
 			<item name="License" href="license.html" />
@@ -82,7 +82,7 @@
 			<topNav>News|Download|Wiki|Documentation|Get Involved</topNav>
 			<!-- <toc>sidebar</toc> -->
 			<!-- <tocTopMax>4</tocTopMax> -->
-			<absoluteResourceURL>http://teetime.sourceforge.net
+			<absoluteResourceURL>http://christianwulf.github.io/teetime/
 			</absoluteResourceURL>
 			<theme>default</theme>
 			<highlightJs>true</highlightJs>
@@ -91,7 +91,7 @@
 				<name>
 					TeeTime
 				</name>
-				<href>http://teetime.sourceforge.net</href>
+				<href>http://christianwulf.github.io/teetime/</href>
 			</brand>
 			<slogan>
 				<![CDATA[