diff --git a/winsup/doc/ChangeLog b/winsup/doc/ChangeLog
index 5b4db9745..f18538ec0 100644
--- a/winsup/doc/ChangeLog
+++ b/winsup/doc/ChangeLog
@@ -1,3 +1,9 @@
+2006-08-25  Joshua Daniel Franklin  <joshuadfranklin@yahoo.com>
+
+        * faq-setup.xml (faq.setup.uninstall): Mention Safe Mode
+	requirement for accessing the Security tab in XP Home.
+        * faq-using.xml (faq.using.chmod): Mention FAT32.
+
 2006-08-09  Christopher Faylor  <cgf@timesys.com>
 
 	* overview2.sgml: Remove inaccurate "full support for windows
diff --git a/winsup/doc/faq-setup.xml b/winsup/doc/faq-setup.xml
index c64cc4ce4..5de59bb91 100644
--- a/winsup/doc/faq-setup.xml
+++ b/winsup/doc/faq-setup.xml
@@ -374,27 +374,33 @@ the action reads ``Uninstall''.  Proceed by clicking ``Next''.
 <qandaentry id="faq.setup.uninstall-service">
 <question><para>How do I uninstall a Cygwin service?</para></question>
 <answer>
-<para>If you don't know the name of the service, you can list all
-services you have installed with <literal>cygrunsrv -L</literal>. Before
-removing the service, you should stop it with 
+<orderedlist>
+<listitem><para>List all services you have installed with 
+<literal>cygrunsrv -L</literal>. If you do not have 
+<literal>cygrunsrv</literal> installed, skip this FAQ.
+</para></listitem>
+<listitem><para>Before removing the service, you should stop it with 
 <literal>cygrunsrv --stop <replaceable>service_name</replaceable></literal>. 
 If you have <literal>inetd</literal> configured to run as a standalone
-service, it will not show up in the list, but <literal>cygrunsrv --stop inetd</literal>
-will work to stop it as well. Lastly, remove the service with
+service, it will not show up in the list, but 
+<literal>cygrunsrv --stop inetd</literal> will work to stop it as 
+well.
+</para></listitem> 
+<listitem><para>Lastly, remove the service with
 <literal>cygrunsrv --remove <replaceable>service_name</replaceable></literal>.
-</para>
+</para></listitem>
+</orderedlist>
 </answer></qandaentry>
 
 <qandaentry id="faq.setup.uninstall-all">
 <question><para>How do I uninstall <emphasis role='bold'>all</emphasis> of Cygwin?</para></question>
 <answer>
-
 <para>Setup has no automatic uninstall facility.  The recommended method to remove all 
 of Cygwin is as follows:
 </para>
 <orderedlist>
-<listitem><para>First remove all Cygwin services by repeating the instructions
-in <ulink
+<listitem><para>If you have any Cygwin services running, remove by repeating 
+the instructions in <ulink
 url="http://cygwin.com/faq/faq.setup.html#faq.setup.uninstall-service" /> for
 all services that you installed.  Common services that might have been
 installed are <literal>sshd</literal>, <literal>cron</literal>, 
@@ -420,12 +426,14 @@ services end up owned by the SYSTEM account and not writable by regular users.
 <para>The quickest way to delete the entire tree if you run into this problem is to 
 change the ownership of all files and folders to your account.  To do this in 
 Windows Explorer, right click on the root Cygwin folder, choose Properties, then 
-the Security tab.  Select Advanced, then go to the Owner tab and make sure your 
-account is listed as the owner.  Select the 'Replace owner on subcontainers and 
-objects' checkbox and press Ok.  After Explorer applies the changes you should 
-be able to delete the entire tree in one operation.  Note that you can also 
-achieve this in Cygwin by typing <literal>chown -R user /</literal> or by using other tools 
-such as CACLS.EXE.
+the Security tab.  If you are using Windows XP Home or Simple File Sharing,
+you will need to boot into Safe Mode to access the Security tab.  Select 
+Advanced, then go to the Owner tab and make sure your account is listed as 
+the owner.  Select the 'Replace owner on subcontainers and objects' checkbox 
+and press Ok.  After Explorer applies the changes you should be able to 
+delete the entire tree in one operation.  Note that you can also achieve 
+this in Cygwin by typing <literal>chown -R user /</literal> or by using other 
+tools such as <literal>CACLS.EXE</literal>. 
 </para>
 </listitem>
 <listitem><para>Delete the Cygwin shortcuts on the Desktop and Start Menu, and anything 
diff --git a/winsup/doc/faq-using.xml b/winsup/doc/faq-using.xml
index 8c1835645..504a3e763 100644
--- a/winsup/doc/faq-using.xml
+++ b/winsup/doc/faq-using.xml
@@ -279,7 +279,7 @@ must create the whatis database.  Just run the command
 </answer></qandaentry>
 
 <qandaentry id="faq.using.chmod">
-<question><para>Why doesn't chmod work?</para></question>
+<question><para>Why doesn't <literal>chmod</literal> work?</para></question>
 <answer>
 
 <para>The most common case is that your <literal>/etc/passwd</literal>
@@ -288,6 +288,10 @@ or <literal>/etc/group</literal> files are not properly set up. If
 or <literal>mkgroup</literal>, you need to run one or both of those
 commands.
 </para>
+<para>If you're using FAT32 instead of NTFS, <literal>chmod</literal> 
+will fail since FAT32 does not provide any security. You might consider 
+converting the drive to NTFS with <literal>CONVERT.EXE</literal>.
+</para>
 <para>For other cases, understand that Cygwin attempts to show UNIX 
 permissions based on the security features of Windows, so the Windows 
 ACLs are likely the source of your problem.  See the Cygwin User's 
@@ -398,7 +402,6 @@ lines to your <literal>~/.inputrc</literal> file and restart <literal>bash</lite
         set output-meta on 
 	set input-meta on
 	set kanji-code sjis
-	set meta-flag on
 </screen>
 
 <para>These are options to the <literal>readline</literal> library, which you can read