diff --git a/faq/plugin.jelly b/faq/plugin.jelly
index fe152bf7..dbc2e026 100644
--- a/faq/plugin.jelly
+++ b/faq/plugin.jelly
@@ -26,6 +26,7 @@
   xmlns:ant="jelly:ant"
   xmlns:define="jelly:define"
   xmlns:doc="doc"
+  xmlns:plugin="plugin"
   xmlns:assert="assert"
   xmlns:faq="faq">
 
@@ -143,4 +144,19 @@
       <faq:performTransformation srcdir="${maven.faq.src}" destdir="${maven.faq.dest}" />
   </goal>
 
+  <goal name="faq:validate"
+    description="Validates fml files"
+    prereqs="faq:init">
+
+    <j:if test="${fmlFiles.iterator().hasNext()}">
+      <j:forEach var="file" items="${fmlFiles.iterator()}">
+        <plugin:validate-xml
+            schema="${plugin.resources}/xsd/faq.xsd"
+            file="${file}"/>
+      </j:forEach>
+    </j:if>
+
+  </goal>
+
+
 </project>
diff --git a/faq/project.xml b/faq/project.xml
index 528e284c..5ef5f1a6 100644
--- a/faq/project.xml
+++ b/faq/project.xml
@@ -94,6 +94,14 @@
       </roles>
       <timezone>+1</timezone>
     </developer>
+    <developer>
+      <name>Lukas Theussl</name>
+      <id>ltheussl</id>
+      <email>ltheussl@apache.org</email>
+      <roles>
+        <role>Developer</role>
+      </roles>
+    </developer>
   </developers>
   <dependencies>
     <dependency>
diff --git a/faq/src/plugin-resources/xsd/faq.xsd b/faq/src/plugin-resources/xsd/faq.xsd
index a07bc43e..573058e0 100644
--- a/faq/src/plugin-resources/xsd/faq.xsd
+++ b/faq/src/plugin-resources/xsd/faq.xsd
@@ -1,4 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+ * Copyright 2001-2005 The Apache Software Foundation.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+ -->
+
 <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
     elementFormDefault="qualified">
 
@@ -6,7 +24,7 @@
     <xsd:element name="question" type="anything"/>
     <xsd:element name="answer" type="anything"/>
 
-    <xsd:complexType name="anything">
+    <xsd:complexType name="anything" mixed="true">
         <xsd:sequence>
             <xsd:any namespace="##any" processContents="lax"
                 minOccurs="0" maxOccurs="unbounded" /> 
diff --git a/faq/xdocs/changes.xml b/faq/xdocs/changes.xml
index 977a6dbf..774b26df 100644
--- a/faq/xdocs/changes.xml
+++ b/faq/xdocs/changes.xml
@@ -23,6 +23,7 @@
   </properties>
   <body>
     <release version="1.6-SNAPSHOT" date="In SVN">
+      <action dev="ltheussl" type="add">New goal <code>faq:validate</code>.</action>
       <action dev="aheritier" type="update">It requires at least maven-plugin-plugin v1.7.</action>
     </release>
     <release version="1.5" date="2005-09-05">
diff --git a/faq/xdocs/goals.xml b/faq/xdocs/goals.xml
index ab854b53..a62c959f 100644
--- a/faq/xdocs/goals.xml
+++ b/faq/xdocs/goals.xml
@@ -37,6 +37,12 @@
       	    from an XML FAQ document.
       	  </td>
       	</tr>
+        <tr>
+          <td>faq:validate</td>
+          <td>
+            Validate all <code>.fml</code> files in <code>${maven.faq.src}</code>.
+          </td>
+        </tr>
       </table>
     </section>
   </body>
