diff --git a/docs/faq.html b/docs/faq.html
index 97b6491a7bd..dd4e7de0d42 100644
--- a/docs/faq.html
+++ b/docs/faq.html
@@ -16,7 +16,7 @@
 
 <center>
 <h1>Mesa Frequently Asked Questions</h1>
-Last updated: 19 September 2012
+Last updated: 20 September 2012
 </center>
 
 <br>
@@ -52,14 +52,18 @@ Mesa 9.x supports the OpenGL 3.1 specification.
 <h2>1.2 Does Mesa support/use graphics hardware?</h2>
 <p>
 Yes.  Specifically, Mesa serves as the OpenGL core for the open-source DRI
-drivers for XFree86/X.org.  See the <a href="http://dri.freedesktop.org/">DRI
-website</a> for more information.
-</p>
-<p>
-There have been other hardware drivers for Mesa over the years (such as
-the 3Dfx Glide/Voodoo driver, an old S3 driver, etc) but the DRI drivers
-are the modern ones.
+drivers for X.org.
 </p>
+<ul>
+  <li>See the <a href="http://dri.freedesktop.org/">DRI website</a>
+  for more information.</li>
+  <li>See <a href="http://intellinuxgraphics.org">intellinuxgraphics.org</a>
+  for more information about Intel drivers.</li>
+  <li>See <a href="http://nouveau.freedesktop.org">nouveau.freedesktop.org</a>
+  for more information about Nouveau drivers.</li>
+  <li>See <a href="http://www.x.org/wiki/RadeonFeature">www.x.org/wiki/RadeonFeature</a>
+  for more information about Radeon drivers.</li>
+</ul>
 
 <h2>1.3 What purpose does Mesa serve today?</h2>
 <p>
@@ -68,7 +72,7 @@ operating systems today.
 Still, Mesa serves at least these purposes:
 </p>
 <ul>
-<li>Mesa is used as the core of the open-source XFree86/X.org DRI
+<li>Mesa is used as the core of the open-source X.org DRI
     hardware drivers.
 </li>
 <li>Mesa is quite portable and allows OpenGL to be used on systems
@@ -140,7 +144,7 @@ Mesa is much more up to date with modern features and extensions.
 </p>
 
 <p>
-<a href="http://ogl-es.sourceforge.net">Vincent</a> is
+<a href="http://sourceforge.net/projects/ogl-es/">Vincent</a> is
 an open-source implementation of OpenGL ES for mobile devices.
 
 <p>
@@ -148,12 +152,12 @@ an open-source implementation of OpenGL ES for mobile devices.
 is a subset of OpenGL for PalmOS devices.
 
 <p>
-<a href="http://fabrice.bellard.free.fr/TinyGL/">TinyGL</a>
+<a href="http://bellard.org/TinyGL/">TinyGL</a>
 is a subset of OpenGL.
 </p>
 
 <p>
-<a href="http://softgl.studierstube.org/">SoftGL</a>
+<a href="http://sourceforge.net/projects/softgl/">SoftGL</a>
 is an OpenGL subset for mobile devices.
 </p>
 
@@ -232,7 +236,7 @@ Basically you'll want the following:
 Mesa version number.
 </li></ul>
 <p>
-After installing XFree86/X.org and the DRI drivers, some of these files
+After installing X.org and the DRI drivers, some of these files
 may be symlinks into the /usr/X11R6/ tree.
 </p>
 <p>
@@ -267,7 +271,7 @@ hardware it has detected.
 </p>
 <p>
 If your DRI-based driver isn't working, go to the
-<a href="http://dri.sf.net/">DRI website</a> for trouble-shooting information.
+<a href="http://dri.freedesktop.org/">DRI website</a> for trouble-shooting information.
 </p>