diff --git a/include/boost/config/platform/cygwin.hpp b/include/boost/config/platform/cygwin.hpp
index d0052d8b4..650bc7dfe 100644
--- a/include/boost/config/platform/cygwin.hpp
+++ b/include/boost/config/platform/cygwin.hpp
@@ -59,13 +59,9 @@
 // boilerplate code:
 #include <boost/config/detail/posix_features.hpp>
 
-//
-// Cygwin lies about XSI conformance, there is no nl_types.h:
-//
+#if (CYGWIN_VERSION_API_MAJOR == 0 && CYGWIN_VERSION_API_MINOR < 325)
+// Prior to CYGWIN_VERSION_API_MINOR=325 Cygwin lies about XSI conformance, there is no nl_types.h:
 #ifdef BOOST_HAS_NL_TYPES_H
 #  undef BOOST_HAS_NL_TYPES_H
 #endif
-
-
-
-
+#endif