diff --git a/CHANGES.txt b/CHANGES.txt
index ddae39baaf9ab737bff211e023aabb89c55dd575_Q0hBTkdFUy50eHQ=..a2972a474e633b0fd5e9436a19ea1d6599e83391_Q0hBTkdFUy50eHQ= 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,3 +1,9 @@
+Version 3.1.1 released XXXX-XX-XX
+
+* setup.py now has another workaround for Windows machines without
+  MSVC installed
+  http://bugs.python.org/issue7511
+
 Version 3.1.0 released 2013-02-21
 
 * Updated JSON conformance test suite
diff --git a/setup.py b/setup.py
index ddae39baaf9ab737bff211e023aabb89c55dd575_c2V0dXAucHk=..a2972a474e633b0fd5e9436a19ea1d6599e83391_c2V0dXAucHk= 100644
--- a/setup.py
+++ b/setup.py
@@ -35,4 +35,5 @@
 if sys.platform == 'win32' and sys.version_info > (2, 6):
    # 2.6's distutils.msvc9compiler can raise an IOError when failing to
    # find the compiler
+   # It can also raise ValueError http://bugs.python.org/issue7511
    ext_errors = (CCompilerError, DistutilsExecError, DistutilsPlatformError,
@@ -38,5 +39,5 @@
    ext_errors = (CCompilerError, DistutilsExecError, DistutilsPlatformError,
-                 IOError)
+                 IOError, ValueError)
 else:
    ext_errors = (CCompilerError, DistutilsExecError, DistutilsPlatformError)