diff --git a/src/documentation/content/xdocs/faq.xml b/src/documentation/content/xdocs/faq.xml
new file mode 100644
index 0000000..1143909
--- /dev/null
+++ b/src/documentation/content/xdocs/faq.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE faqs PUBLIC "-//APACHE//DTD FAQ V1.2//EN" "dtd/faq-v12.dtd">
+
+<faqs title="Frequently Asked Questions">
+
+  <part id="general">
+    <title>General</title>
+    <faq id="how_can_i_help">
+      <question>
+        How can i help?
+      </question>
+      <answer>
+        <p>
+          Join the commons-dev <link href="site:mail-lists">mailing list</link>
+          and start a topic.
+        </p>
+      </answer>
+    </faq>
+
+    <!-- add other faqs here -->
+  </part>
+
+  <!-- add other parts here -->
+</faqs>
diff --git a/src/documentation/content/xdocs/site.xml b/src/documentation/content/xdocs/site.xml
index 49d6f8b..0546549 100644
--- a/src/documentation/content/xdocs/site.xml
+++ b/src/documentation/content/xdocs/site.xml
@@ -5,6 +5,7 @@
     <index label="Index" href="index.html"/>
     <licenses label="Licenses" href="licenses.html"/>
     <download label="Download" href="http://xml.apache.org/dist/commons/"/>
+    <faq label="FAQs" href="faq.html"/>
     <changes label="Changes" href="changes.html"/>
     <todo label="Todo" href="todo.html"/>
     <history label="History" href="history.html"/>