diff --git a/documentation/faq.sgml b/documentation/faq.sgml
index b31d42d19aa..33cce0a7a12 100644
--- a/documentation/faq.sgml
+++ b/documentation/faq.sgml
@@ -1,10 +1,11 @@
 <!-- *** Wine FAQ *** -->
-    <para>This is the general Wine FAQ.</para>
-    <para>
-       For technical questions, visit the 
-       <ulink url="http://www.winehq.org/fom-meta/cache/19.html">
-       Wine Troubleshooting Guide</ulink> instead.
-    </para>
+  <title>Wine FAQ</title>
+  <para>
+     For technical questions, visit the 
+     <ulink url="http://www.winehq.org/fom-meta/cache/19.html">
+     Wine Troubleshooting Guide</ulink> instead.
+  </para>
+
   <qandaset>
     <qandadiv id="About-this-FAQ"><title>About this FAQ</title>
       <qandaentry>
diff --git a/documentation/wine-doc.sgml b/documentation/wine-doc.sgml
index 30ba0a4f889..944b1328f3c 100644
--- a/documentation/wine-doc.sgml
+++ b/documentation/wine-doc.sgml
@@ -146,11 +146,12 @@
   <!-- *** Wine Faq *** -->
   <book id="faq">
     <bookinfo>
-
-    <title>Wine FAQ</title>
+      <title>Wine FAQ</title>
     </bookinfo>
 
-    &faq;
+    <article class="faq">
+      &faq;
+    </article>
 
   </book>
 </set>
diff --git a/documentation/wine-faq.sgml b/documentation/wine-faq.sgml
index f7d01c7f9b0..c644c3cfed6 100644
--- a/documentation/wine-faq.sgml
+++ b/documentation/wine-faq.sgml
@@ -7,8 +7,6 @@
 <!entity faq SYSTEM "faq.sgml">
 ]>
 
-<article id="index">
-  <title>Wine FAQ</title>
-  
-  &faq;
+<article class="faq">
+&faq;
 </article>