diff --git a/FAQ b/FAQ
new file mode 100644
index 00000000..c651eacb
--- /dev/null
+++ b/FAQ
@@ -0,0 +1,9 @@
+= Frequently Asked Questions
+
+== You still haven't answered my question!
+
+Sorry! Try looking at the Haml or Sass references,
+in the doucmentation for the haml and Sass modules, respectively.
+If you can't find an answer there,
+feel free to ask in #haml on irc.freenode.net
+or send an email to the {mailing list}[http://groups.google.com/group/haml?hl=en].
diff --git a/Rakefile b/Rakefile
index f4206d4d..337837d3 100644
--- a/Rakefile
+++ b/Rakefile
@@ -94,8 +94,12 @@ end
 rdoc_task = Proc.new do |rdoc|
   rdoc.title    = 'Haml/Sass'
   rdoc.options << '--line-numbers' << '--inline-source'
-  rdoc.rdoc_files.include('README.rdoc')
+  rdoc.rdoc_files.include(*FileList.new('*') do |list|
+                            list.exclude(/(^|[^.a-z])[a-z]+/)
+                            list.exclude('TODO')
+                          end.to_a)
   rdoc.rdoc_files.include('lib/**/*.rb')
+  rdoc.rdoc_files.exclude('TODO')
   rdoc.rdoc_files.exclude('lib/haml/buffer.rb')
   rdoc.rdoc_files.exclude('lib/sass/tree/*')
 end