diff --git a/src/site/fml/faq.fml b/src/site/fml/faq.fml
deleted file mode 100644
index d27c88e4e1a568d9f247199c5d48350ebc0264df..0000000000000000000000000000000000000000
--- a/src/site/fml/faq.fml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<faqs xmlns="http://maven.apache.org/FML/1.0.1"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/FML/1.0.1 http://maven.apache.org/xsd/fml-1.0.1.xsd"
-  title="Frequently Asked Questions"
-  toplink="false">
-
-  <part id="general">
-    <title>General</title>
-
-    <faq id="whats-foo">
-      <question>
-        What is Foo?
-      </question>
-      <answer>
-        <p>some markup goes here</p>
-
-        <source>some source code</source>
-
-        <p>some markup goes here</p>
-      </answer>
-    </faq>
-
-    <faq id="whats-bar">
-      <question>
-        What is Bar?
-      </question>
-      <answer>
-        <p>some markup goes here</p>
-      </answer>
-    </faq>
-  </part>
-
-  <part id="install">
-
-    <title>Installation</title>
-
-    <faq id="how-install">
-      <question>
-        How do I install Foo?
-      </question>
-      <answer>
-        <p>some markup goes here</p>
-      </answer>
-    </faq>
-
-  </part>
-
-</faqs>
\ No newline at end of file
diff --git a/src/site/markdown/wiki b/src/site/markdown/wiki
index cdfd44ee829e7bba079ee71983e5711a4e6cb259..a93581905ef7b0584d52eae1898148ffa6201a31 160000
--- a/src/site/markdown/wiki
+++ b/src/site/markdown/wiki
@@ -1 +1 @@
-Subproject commit cdfd44ee829e7bba079ee71983e5711a4e6cb259
+Subproject commit a93581905ef7b0584d52eae1898148ffa6201a31
diff --git a/src/site/resources/wiki/.htaccess b/src/site/resources/wiki/.htaccess
index 74959ccfe1d4fbefec3900a270ef0e2e2846b5d4..f5b7bc87d8325f09bb7620aa4d782ccf20a15fe4 100644
--- a/src/site/resources/wiki/.htaccess
+++ b/src/site/resources/wiki/.htaccess
@@ -1,2 +1,4 @@
+RewriteEngine on
+CheckSpelling on
 Options MultiViews
-DirectoryIndex home.html
\ No newline at end of file
+DirectoryIndex home.html
diff --git a/src/site/site.xml b/src/site/site.xml
index 759a7009804dfd15184d029ba18a0fa084161891..0dacc58e779000124355f1717b9b8f89367fb6c4 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -49,8 +49,7 @@
 		<links>
 			<item name="News" href="news.html" />
 			<item name="Download" href="download.html" />
-			<item name="Wiki"
-				href="https://build.se.informatik.uni-kiel.de/gitlab/chw/teetime/wikis/home" />
+			<item name="Wiki" href="wiki/" />
 		</links>
 		<menu name="Documentation">
 			<item name="JavaDoc" href="apidocs/index.html" />