diff --git a/pom.xml b/pom.xml
index f3f91f1ffed3f7ebee437ef834760e0e1e2ffd85..d53d5fdd9caa115a5a27498719e45106a47faa74 100644
--- a/pom.xml
+++ b/pom.xml
@@ -314,6 +314,9 @@
 				<artifactId>maven-javadoc-plugin</artifactId>
 				<version>2.10.1</version>
 				<configuration>
+					<links>
+						<link>${basedir}/src/site/index.html</link>
+					</links>
 					<!-- <stylesheetfile>${basedir}/src/main/javadoc/stylesheet.css</stylesheetfile> -->
 					<!-- <show>public</show> -->
 				</configuration>
diff --git a/src/site/fml/faq.fml b/src/site/fml/faq.fml
new file mode 100644
index 0000000000000000000000000000000000000000..d27c88e4e1a568d9f247199c5d48350ebc0264df
--- /dev/null
+++ b/src/site/fml/faq.fml
@@ -0,0 +1,49 @@
+<?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/site.xml b/src/site/site.xml
index eb5a9792acfd7f622e366030fdaf030989738888..e163d018a6b632d13cb277c6295707397146e525 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -1,63 +1,69 @@
 <project name="TeeTime">
-	<publishDate position="right"/>
-  <skin>
-    <groupId>lt.velykis.maven.skins</groupId>
-    <artifactId>reflow-maven-skin</artifactId>
-    <version>1.1.1</version>
-  </skin>
-  <body>
-  	<menu name="Tutorial">
-  		<item name="Introduction" href="wiki/home.html"/>
-  	</menu>
-  	<menu name="Documentation">
-  		<item name="JavaDoc" href="apidocs/index.html" />
-  		<item name="Dependencies" href="dependencies.html"/>
-  	</menu>
-  	<menu name="About">
-  		<item name="Dependency Information" href="dependency-info.html"/>
-  		<item name="License" href="license.html"/>
-  		<item name="Team" href="team-list.html"/>
-  	</menu>
-<!--     <menu ref="modules"/> -->
-<!--     <menu ref="reports"/> -->
-  </body>
-  <custom>
-    <reflowSkin>
-      <theme>bootswatch-spacelab</theme>
-      <highlightJs>true</highlightJs>
-      <brand>
-        <name>TeeTime</name>
-        <href>index.html</href>
-      </brand>
-<!--       <slogan>Make analysis clever and faster.</slogan> -->
-<!--       <titleTemplate>%2$s | %1$s</titleTemplate> -->
-<!--       <toc>top</toc> -->
-<!--       <topNav>Download|reports|modules</topNav> -->
-<!--       <bottomNav> -->
-<!--         <column>Main|Download</column> -->
-<!--         <column>Documentation</column> -->
-<!--         <column>reports|modules</column> -->
-<!--       </bottomNav> -->
-<!--       <bottomDescription> -->
-<!--         This is a very good project doing interesting and valuable things. -->
-<!--       </bottomDescription> -->
-<!--       <pages> -->
-<!--         <index project="project-id"> -->
-<!--           <shortTitle>Welcome</shortTitle> -->
-<!--           <breadcrumbs>false</breadcrumbs> -->
-<!--           <toc>false</toc> -->
-<!--           <sections> -->
-<!--             <carousel /> -->
-<!--             <body /> -->
-<!--             <sidebar /> -->
-<!--             <thumbs>2</thumbs> -->
-<!--             <columns>3</columns> -->
-<!--           </sections> -->
-<!--         </index> -->
-<!--         <developer-info> -->
-<!--           <toc>sidebar</toc> -->
-<!--         </developer-info> -->
-<!--       </pages> -->
-    </reflowSkin>
-  </custom>
+	<skin>
+		<groupId>lt.velykis.maven.skins</groupId>
+		<artifactId>reflow-maven-skin</artifactId>
+		<version>1.1.1</version>
+	</skin>
+	<body>
+		<menu name="Tutorial">
+			<item name="Introduction" href="wiki/home.html" />
+		</menu>
+		<menu name="Documentation">
+			<item name="JavaDoc" href="apidocs/index.html" />
+			<item name="Dependencies" href="dependencies.html" />
+		</menu>
+		<menu name="About">
+			<item name="Dependency Information" href="dependency-info.html" />
+			<item name="License" href="license.html" />
+			<item name="Team" href="team-list.html" />
+			<item name="FAQ" href="faq.html" />
+		</menu>
+		<!-- <menu ref="modules"/> -->
+		<!-- <menu ref="reports"/> -->
+	</body>
+	<custom>
+		<reflowSkin>
+			<theme>bootswatch-flatly</theme>
+			<highlightJs>true</highlightJs>
+			<brand>
+				<name>TeeTime</name>
+				<href>index.html</href>
+			</brand>
+			<pages>
+				<index project="TeeTime">
+					<publishDate position="right" />
+					<version position="left" />
+				</index>
+			</pages>
+			<!-- <slogan>Make analysis clever and faster.</slogan> -->
+			<!-- <titleTemplate>%2$s | %1$s</titleTemplate> -->
+			<!-- <toc>top</toc> -->
+			<!-- <topNav>Download|reports|modules</topNav> -->
+			<!-- <bottomNav> -->
+			<!-- <column>Main|Download</column> -->
+			<!-- <column>Documentation</column> -->
+			<!-- <column>reports|modules</column> -->
+			<!-- </bottomNav> -->
+			<!-- <bottomDescription> -->
+			<!-- This is a very good project doing interesting and valuable things. -->
+			<!-- </bottomDescription> -->
+			<!-- <pages> -->
+			<!-- <index project="project-id"> -->
+			<!-- <shortTitle>Welcome</shortTitle> -->
+			<!-- <breadcrumbs>false</breadcrumbs> -->
+			<!-- <toc>false</toc> -->
+			<!-- <sections> -->
+			<!-- <carousel /> -->
+			<!-- <body /> -->
+			<!-- <sidebar /> -->
+			<!-- <thumbs>2</thumbs> -->
+			<!-- <columns>3</columns> -->
+			<!-- </sections> -->
+			<!-- </index> -->
+			<!-- <developer-info> -->
+			<!-- <toc>sidebar</toc> -->
+			<!-- </developer-info> -->
+			<!-- </pages> -->
+		</reflowSkin>
+	</custom>
 </project>
\ No newline at end of file