diff --git a/ChangeLog b/ChangeLog
index 7fd13d6ea..f3d8ea6f5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2007-06-12  Matthew Allum  <mallum@openedhand.com>
+
+	* doc/manual/Makefile.am:
+	Fix typo in Makefile so PDF's actually get built.
+
+	* doc/manual/clutter-manual.xml.in:
+	Add an FAQ section with initial entry.
+
 2007-06-12  Tomas Frydrych  <tf@openedhand.com>
 
 	* clutter/clutter-fixed.h:
diff --git a/doc/manual/Makefile.am b/doc/manual/Makefile.am
index 9d3f52ae8..9f8663f52 100644
--- a/doc/manual/Makefile.am
+++ b/doc/manual/Makefile.am
@@ -12,7 +12,7 @@ pdf-build.stamp: clutter-manual.xml
 txt-build.stamp: clutter-manual.xml 
 	xmlto txt $(srcdir)/clutter-manual.xml
 	mv $(srcdir)/clutter-manual.txt clutter-manual-@CLUTTER_MAJORMINOR@.txt
-	touch pdf-build.stamp
+	touch txt-build.stamp
 
 htmldoc-build.stamp: clutter-manual.xml
 	$(mkinstalldirs) html
diff --git a/doc/manual/clutter-manual.xml.in b/doc/manual/clutter-manual.xml.in
index f5bd061e0..800ad9a99 100644
--- a/doc/manual/clutter-manual.xml.in
+++ b/doc/manual/clutter-manual.xml.in
@@ -82,10 +82,40 @@
 		</section>
 	</chapter>
 
+	<appendix id="FAQ">
+		 <title>
+			Frequently Asked Questions
+		</title>
+		<qandaset defaultlabel='qanda'>
+		<qandaentry>
+			<question>
+				<para>
+
+				Why do Clutter applications run <emphasis>really</emphasis> slowly on Intel cards even though 
+				direct rendering support is reported.
+
+				</para>
+			</question>			
+			<answer>
+				<para>
+
+				There is a bug in some versions of the Intel drivers that causes the driver to 'stall' when 
+				attempting to sync to vblank (as Clutter does by default). The fix is to either upgrade 
+				your drivers or set 'CLUTTER_VBLANK=none' when running Clutter applications.					
+
+				</para>
+			</answer>
+		</qandaentry>		
+		</qandaset>	
+	</appendix>
+
 	<appendix id="contrib">
 	    <title>Contributing to this document</title>
-	    <para>This document is written in Docbook XML. The source file for it is located in the
-	    	  subdirectory "doc" of the source directory of Clutter.
+	    <para>
+
+		  This document is written in Docbook XML. The source file for it is located in the
+	    	  subdirectory "doc/manual" of the source directory of Clutter.
+
 	    </para>
 	</appendix>