diff --git a/include/boost/config/compiler/pgi.hpp b/include/boost/config/compiler/pgi.hpp
index 491497d4..0f88d38e 100644
--- a/include/boost/config/compiler/pgi.hpp
+++ b/include/boost/config/compiler/pgi.hpp
@@ -7,6 +7,7 @@
 
 //  PGI C++ compiler setup:
 
+#define BOOST_COMPILER_VERSION __PGIC__##__PGIC_MINOR__
 #define BOOST_COMPILER "PGI compiler version " BOOST_STRINGIZE(_COMPILER_VERSION)
 
 //
@@ -15,10 +16,17 @@
 // if no threading API is detected.
 //
 
+#if (__PGIC__ == 7) && (__PGIC_MINOR__ == 1)
+
 #define BOOST_FUNCTION_SCOPE_USING_DECLARATION_BREAKS_ADL 
 #define BOOST_NO_TWO_PHASE_NAME_LOOKUP
 #define BOOST_NO_SWPRINTF
 
+#else
+
+#  error "Pgi compiler not configured - please reconfigure"
+
+#endif
 //
 // version check:
 // probably nothing to do here?