diff --git a/include/pybind11/descr.h b/include/pybind11/descr.h
index e4a504e0..ad3c7ddd 100644
--- a/include/pybind11/descr.h
+++ b/include/pybind11/descr.h
@@ -15,8 +15,9 @@
 NAMESPACE_BEGIN(pybind11)
 NAMESPACE_BEGIN(detail)
 
-
-#if defined(__clang__)
+#if defined(__INTEL_COMPILER)
+/* C++14 features not supported for now */
+#elif defined(__clang__)
 #  if __has_feature(cxx_return_type_deduction) && __has_feature(cxx_relaxed_constexpr)
 #    define PYBIND11_CPP14
 #  endif
diff --git a/include/pybind11/eigen.h b/include/pybind11/eigen.h
index 0035cc6e..63a48088 100644
--- a/include/pybind11/eigen.h
+++ b/include/pybind11/eigen.h
@@ -11,7 +11,9 @@
 
 #include "numpy.h"
 
-#if defined(__GNUG__) || defined(__clang__)
+#if defined(__INTEL_COMPILER)
+#  pragma warning(disable: 1682) // implicit conversion of a 64-bit integral type to a smaller integral type (potential portability problem)
+#elif defined(__GNUG__) || defined(__clang__)
 #  pragma GCC diagnostic push
 #  pragma GCC diagnostic ignored "-Wconversion"
 #  pragma GCC diagnostic ignored "-Wdeprecated-declarations"