diff --git a/Misc/NEWS b/Misc/NEWS
index f3f2a1e9f42..372b3fe95b1 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -126,6 +126,11 @@ Tools/Demos
 
 - Issue #15239: Make mkstringprep.py work again on Python 3.
 
+Build
+-----
+
+- Issue #15172: Document NASM 2.10+ as requirement for building OpenSSL 1.0.1
+  on Windows.
 
 What's New in Python 3.3.2?
 ===========================
diff --git a/PCbuild/readme.txt b/PCbuild/readme.txt
index 2efe2494654..89fca3e2cf7 100644
--- a/PCbuild/readme.txt
+++ b/PCbuild/readme.txt
@@ -152,9 +152,12 @@ _ssl
     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.