diff --git a/chapter01/chapter01.xml b/chapter01/chapter01.xml
index 4b010252b..6aa1ab050 100644
--- a/chapter01/chapter01.xml
+++ b/chapter01/chapter01.xml
@@ -10,6 +10,7 @@
 &c1-changelog;
 &c1-maillists;
 &c1-newsserver;
+&c1-faq;
 &c1-contactinfo;
 
 </chapter>
diff --git a/chapter01/faq.xml b/chapter01/faq.xml
new file mode 100644
index 000000000..2d02f1fbf
--- /dev/null
+++ b/chapter01/faq.xml
@@ -0,0 +1,12 @@
+<sect1 id="ch01-faq">
+<title>FAQ</title>
+<?dbhtml filename="faq.html" dir="chapter01"?>
+
+<para>If you encounter any problems building an LFS system, you should
+check out <ulink
+url="http://www.linuxfromscratch.org/faq/">
+http://www.linuxfromscratch.org/faq/</ulink> to see if your question is
+already answered in the FAQ.</para>
+
+</sect1>
+
diff --git a/index.xml b/index.xml
index 096ebcb11..ddbe170ae 100644
--- a/index.xml
+++ b/index.xml
@@ -58,6 +58,7 @@
 <!ENTITY c1-ma-mailarchive SYSTEM "chapter01/mailarchive.xml">
 <!ENTITY c1-ma-othermodes SYSTEM "chapter01/othermodes.xml">
 <!ENTITY c1-newsserver SYSTEM "chapter01/newsserver.xml">
+<!ENTITY c1-faq SYSTEM "chapter01/faq.xml">
 <!ENTITY c1-contactinfo SYSTEM "chapter01/contactinfo.xml">
 
 <!ENTITY chapter02 SYSTEM "chapter02/chapter02.xml">