diff --git a/Misc/NEWS b/Misc/NEWS
index 194a2b8..9cf8998 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -493,6 +493,8 @@
 - Issue #17547: In configure, explicitly pass -Wformat for the benefit for GCC
   4.8.
 
+- Issue #15172: Document NASM 2.10+ as requirement for building OpenSSL 1.0.1
+  on Windows.
 
 What's New in Python 3.3.1 release candidate 1?
 ===============================================
diff --git a/PCbuild/readme.txt b/PCbuild/readme.txt
index b60f22d..88690e9 100644
--- a/PCbuild/readme.txt
+++ b/PCbuild/readme.txt
@@ -152,9 +152,12 @@
     You can (theoretically) use any version of OpenSSL you like - the
     build process will automatically select the latest version.
 
-    You must install the NASM assembler from
+    You must install the NASM assembler 2.10 or newer from
         http://nasm.sf.net
-    for x86 builds.  Put nasmw.exe anywhere in your PATH.
+    for x86 builds.  Put nasmw.exe anywhere in your PATH. More recent
+    versions of OpenSSL may need a later version of NASM. If OpenSSL's self
+    tests don't pass, you should first try to update NASM and do a full
+    rebuild of OpenSSL.
     Note: recent releases of nasm only have nasm.exe. Just rename it to 
     nasmw.exe.