diff --git a/Include/pyport.h b/Include/pyport.h
index 736b984e056..0c78a1e5b66 100644
--- a/Include/pyport.h
+++ b/Include/pyport.h
@@ -702,7 +702,9 @@ extern int fdatasync(int);
 
 #ifdef __FreeBSD__
 #include <osreldate.h>
-#if __FreeBSD_version > 500039
+#if (__FreeBSD_version >= 500040 && __FreeBSD_version < 602113) || \
+    (__FreeBSD_version >= 700000 && __FreeBSD_version < 700054) || \
+    (__FreeBSD_version >= 800000 && __FreeBSD_version < 800001)
 # define _PY_PORT_CTYPE_UTF8_ISSUE
 #endif
 #endif
diff --git a/Misc/NEWS b/Misc/NEWS
index 4a232707d27..b9d473499d3 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -97,6 +97,13 @@ Tests
 - Issue #27369: In test_pyexpat, avoid testing an error message detail that
   changed in Expat 2.2.0.
 
+Build
+-----
+
+- Issue #10910: Avoid C++ compilation errors on FreeBSD and OS X.
+  Also update FreedBSD version checks for the original ctype UTF-8 workaround.
+
+
 What's New in Python 2.7.12?
 ============================