diff --git a/README.md b/README.md
index ca29a69..8013cff 100644
--- a/README.md
+++ b/README.md
@@ -75,9 +75,16 @@
   equivalent bindings generated by Boost.Python.
 
 - When supported by the compiler, two new C++14 features (relaxed constexpr and
-  return value deduction) are used to deduce function signatures at compile
+  return value deduction) are used to precompute function signatures at compile
   time, leading to smaller binaries.
 
+## Supported compilers
+
+1. Clang/LLVM (any non-ancient version with C++11 support)
+2. GCC (any non-ancient version with C++11 support)
+3. Microsoft Visual Studio 2015 or newer
+4. Intel C++ compiler v15 or newer
+
 ### License
 
 pybind11 is provided under a BSD-style license that can be found in the
diff --git a/docs/intro.rst b/docs/intro.rst
index 6eb5038..a997a0b 100644
--- a/docs/intro.rst
+++ b/docs/intro.rst
@@ -71,5 +71,13 @@
   equivalent bindings generated by Boost.Python.
 
 - When supported by the compiler, two new C++14 features (relaxed constexpr and
-  return value deduction) are used to deduce function signatures at compile
+  return value deduction) are used to precompute function signatures at compile
   time, leading to smaller binaries.
+
+Supported compilers
+*******************
+
+1. Clang/LLVM (any non-ancient version with C++11 support)
+2. GCC (any non-ancient version with C++11 support)
+3. Microsoft Visual Studio 2015 or newer
+4. Intel C++ compiler v15 or newer