diff --git a/FAQ.md b/FAQ.md
index 7ac5909..1bc151d 100644
--- a/FAQ.md
+++ b/FAQ.md
@@ -1,6 +1,6 @@
 Q: What is special about Tahoe-LAFS? Why should anyone care about it instead of [other distributed storage systems](http://allmydata.org/trac/tahoe/wiki/RelatedProjects#OtherProjects)?
 
-A1: Tahoe-LAFS is the first Free Software/Open Source storage technology which offers *provider-independent security*.  *Provider-independent security* means that the integrity and confidentiality of your files is guaranteed by mathematics computed on the client side, and is independent of the servers, which may be owned and operated by someone else.  To learn more, read [our one-page explanation](http://allmydata.org/source/tahoe/trunk/docs/about.html).
+A1: Tahoe-LAFS is the first Free !Software/Open Source storage technology which offers *provider-independent security*.  *Provider-independent security* means that the integrity and confidentiality of your files is guaranteed by mathematics computed on the client side, and is independent of the servers, which may be owned and operated by someone else.  To learn more, read [our one-page explanation](http://allmydata.org/source/tahoe/trunk/docs/about.html).
 
 A2: Tahoe-LAFS is an extremely reliable, distributed, fault-tolerant storage system. Even if you do not need its security properties, you might want to use Tahoe-LAFS as a very robust and flexible storage platform. (Tahoe-LAFS's security features do an excellent job of staying out of your way when you don't need them.)
 
@@ -27,8 +27,8 @@ 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).
+ 2. Follow [the standard quickstart instructions](http://tahoe-lafs.org/source/tahoe-lafs/trunk/docs/quickstart.html) to get Tahoe-LAFS running on Windows.
 
 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 (as of Tahoe-LAFS v1.6.1). See the "mac" targets [in the Makefile]source:Makefile@#L440.
\ No newline at end of file
+A: Yes.  Follow [the standard quickstart instructions](http://tahoe-lafs.org/source/tahoe-lafs/trunk/docs/quickstart.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 (as of Tahoe-LAFS v1.6.1). See the "mac" targets [in the Makefile]source:Makefile@#L440.
\ No newline at end of file