diff --git a/FAQ.md b/FAQ.md
index cf098a3..f09d036 100644
--- a/FAQ.md
+++ b/FAQ.md
@@ -29,4 +29,10 @@ A: Yes.  There are two ways to do it:
 either
  1. Get the installer from allmydata.com.  This installer installs Tahoe-LAFS, a Windows virtual drive backed by Tahoe-LAFS, and a backup client that runs on Windows. It is configured to use the allmydata.com production grid.  Allmydata.com charges a monthly fee for the use of their grid (see <http://allmydata.com> for details), or you can edit the configuration file to point it to a different grid.
 or else
- 2. Follow these instructions to build on Windows: [InstallOnWindows](InstallOnWindows).
\ No newline at end of file
+ 2. Follow these instructions to build on Windows: [InstallOnWindows](InstallOnWindows).
+
+Q. Does Tahoe-LAFS work on Mac OS X?
+
+A: Yes.  Follow [the standard install instructions](http://allmydata.org/source/tahoe-lafs/trunk/docs/install.html) on Mac OS X and it will result in a working command-line tool on Mac OS X just as it does on other Unixes. (This includes the Web User Interface, or "WUI". See the instructions for details.) In addition there is code to generate executables and .dmg packages, but this code is not currently working. See the "mac" targets [in the Makefile]source:Makefile@#L440.
+
+<http://allmydata.org/trac/tahoe-lafs/browser/Makefile?rev=880f824103357172#L440>
\ No newline at end of file