diff --git a/winsup/doc/ChangeLog b/winsup/doc/ChangeLog
index 796634a39..223261304 100644
--- a/winsup/doc/ChangeLog
+++ b/winsup/doc/ChangeLog
@@ -1,3 +1,8 @@
+2013-03-27  Corinna Vinschen  <corinna@vinschen.de>
+
+	* faq-what.xml (faq.what.supported): Mention Windows 8 and Server 2012.
+	Change sentence on native 64 bit version.
+
 2013-03-06  Anthony Geoghegan <anthony.geoghegan@gmail.com>
 
 	* faq-using.xml: Fix expression and uppercase Samba.
diff --git a/winsup/doc/faq-what.xml b/winsup/doc/faq-what.xml
index 523ddcd6d..ff1134042 100644
--- a/winsup/doc/faq-what.xml
+++ b/winsup/doc/faq-what.xml
@@ -29,9 +29,10 @@ sad reason.
 <para>Cygwin can be expected to run on all modern 32 bit versions of
 Windows  This includes, as of the time of writing this, Windows 2000,
 Windows XP, Windows Server 2003, Windows Vista, Windows Server 2008,
-Windows 7, as well as the WOW64 32 bit environment on released 64 bit
-versions of Windows (XP/2003/Vista/2008/7/2008 R2).
-As far as we know no one is working on a native 64 bit version of Cygwin.
+Windows 7, Windows Server 2012, Windows 8, as well as the WOW64 32 bit
+environment on released 64 bit versions of Windows
+(XP/2003/Vista/2008/7/2008 R2/8/2012).
+A native 64 bit Cygwin version is in the works.
 Since Cygwin is a community-supported free software project, patches to
 provide support for other versions would be thoughtfully considered.
 Paid support contracts or enhancements are available through Red Hat.  For