diff --git a/mps/manual/source/guide/overview.rst b/mps/manual/source/guide/overview.rst
index 209ddcd3bf1..6082bd4a279 100644
--- a/mps/manual/source/guide/overview.rst
+++ b/mps/manual/source/guide/overview.rst
@@ -37,6 +37,7 @@ Ravenbrook by arrangement. Please :ref:`contact us <contact>` at
 `mps-questions@ravenbrook.com <mailto:mps-questions@ravenbrook.com>`_
 for details.
 
+.. comment:: Keep this section synchronized with readme.txt
 
 .. index::
    single: Memory Pool System; supported target platforms
@@ -47,9 +48,10 @@ Supported target platforms
 
 The MPS is currently supported for deployment on:
 
-- Windows XP or later on IA-32 and x86-64, using Microsoft Visual C/C++;
+- Windows XP or later, on IA-32 and x86-64, using Microsoft Visual C/C++;
 
-- Linux 2.4 or later, on IA-32 and x86-64, using GCC or Clang/LLVM;
+- Linux 2.4 or later, on IA-32 using GCC and on x86-64 using GCC or
+  Clang/LLVM;
 
 - FreeBSD 7 or later, on IA-32 and x86-64, using GCC;
 
@@ -62,14 +64,13 @@ anything.
 
 .. warning::
 
-    The MPS does not work in a multi-threaded 32-bit application on an
-    unpatched 64-bit Windows 7. This is due to a serious bug in
-    Microsoft's WOW64 emulator. See `WOW64 bug: GetThreadContext() may
-    return stale contents
-    <http://zachsaw.blogspot.co.uk/2010/11/wow64-bug-getthreadcontext-may-return.html>`_.
-    The bug is fixed in Windows 8; on Windows 7 you must install the
-    `hotfix from Microsoft
-    <http://support2.microsoft.com/kb/2864432/en-us>`_.
+    If you are running a multi-threaded 32-bit application on 64-bit
+    Windows 7 via the WOW64 emulator, then you must install `this
+    hotfix from Microsoft
+    <http://support.microsoft.com/kb/2864432/en-us>`_. See `WOW64 bug:
+    GetThreadContext() may return stale contents
+    <http://zachsaw.blogspot.co.uk/2010/11/wow64-bug-getthreadcontext-may-return.html>`_
+    for a description of the problem.
 
 
 .. index::
diff --git a/mps/readme.txt b/mps/readme.txt
index 485ccebd6b5..2959f6eb7b4 100644
--- a/mps/readme.txt
+++ b/mps/readme.txt
@@ -72,26 +72,29 @@ Supported target platforms
 
 The MPS is currently supported for deployment on:
 
-- Windows XP or later on IA-32 and x86-64, using Microsoft Visual C/C++;
+- Windows XP or later, on IA-32 and x86-64, using Microsoft Visual C/C++;
 
-  If you are running a multi-threaded 32-bit application on 64-bit
-  Windows 7 via the WOW64 emulator, then you need this hotfix from
-  Microsoft: `<http://support.microsoft.com/kb/2864432/en-us>`__. (See
-  `<http://zachsaw.blogspot.co.uk/2010/11/wow64-bug-getthreadcontext-may-return.html>`__
-  for a description of the problem.)
-
-- Linux (Ubuntu 12 and 13 known good, otherwise YMMV) on IA-32 using
-  GCC and on x86-64 using GCC or Clang/LLVM;
+- Linux 2.4 or later, on IA-32 using GCC and on x86-64 using GCC or
+  Clang/LLVM;
 
 - FreeBSD 7 or later, on IA-32 and x86-64, using GCC;
 
-- Mac OS X 10.4 or later, on IA-32 and x86-64, using Clang/LLVM.
+- OS X 10.4 or later, on IA-32 and x86-64, using Clang/LLVM.
 
 The MPS is highly portable and has run on many other processors and
 operating systems in the past (see `Building the MPS
 <manual/guide/build.html>`__). Most of the MPS is written in very pure
 ANSI C and compiles without warnings on anything.
 
+.. warning::
+
+    If you are running a multi-threaded 32-bit application on 64-bit
+    Windows 7 via the WOW64 emulator, then you must install this
+    hotfix from Microsoft:
+    `<http://support.microsoft.com/kb/2864432/en-us>`__. See
+    `<http://zachsaw.blogspot.co.uk/2010/11/wow64-bug-getthreadcontext-may-return.html>`__
+    for a description of the problem.
+
 
 Getting help
 ------------