diff --git a/cmake/modules/CMakeLists.txt b/cmake/modules/CMakeLists.txt
index bd841a43c042ce0806b4d072c67e168b01152978..77362f51f87b6f7ae87c19a28edf539d8fe6264a 100644
--- a/cmake/modules/CMakeLists.txt
+++ b/cmake/modules/CMakeLists.txt
@@ -4,7 +4,7 @@ set(modules
   AddParMETISFlags.cmake
   AddPTScotchFlags.cmake
   AddUMFPackFlags.cmake
-  CheckCXX11Features.cmake
+  CheckCXXFeatures.cmake
   DuneBoost.cmake
   DuneCMakePackageConfigHelpers.cmake
   DuneCommonMacros.cmake
diff --git a/cmake/modules/CheckCXX11Features.cmake b/cmake/modules/CheckCXXFeatures.cmake
similarity index 100%
rename from cmake/modules/CheckCXX11Features.cmake
rename to cmake/modules/CheckCXXFeatures.cmake
diff --git a/cmake/modules/DuneMacros.cmake b/cmake/modules/DuneMacros.cmake
index a15abd36b7a69b9b8bcf20a928c389c1ec012de7..8b6a7812e6eb4999e75a75d106c79a930982a7bd 100644
--- a/cmake/modules/DuneMacros.cmake
+++ b/cmake/modules/DuneMacros.cmake
@@ -619,8 +619,8 @@ macro(dune_project)
     endif (APPLE)
   endif(DUNE_USE_ONLY_STATIC_LIBS)
 
-  # set required compiler flags for C++11 (former C++0x)
-  include(CheckCXX11Features)
+  # check for C++ features, set compiler flags for C++14 or C++11 mode
+  include(CheckCXXFeatures)
 
   include(DuneCxaDemangle)
 
diff --git a/cmake/modules/Makefile.am b/cmake/modules/Makefile.am
index 7d63457fa59c839d021f3e373c768073f04ff7e8..2e65265eadd12e2ec0c71e02658dfdd4dc7ee9b7 100644
--- a/cmake/modules/Makefile.am
+++ b/cmake/modules/Makefile.am
@@ -4,7 +4,7 @@ MODULES = \
   AddParMETISFlags.cmake   \
   AddPTScotchFlags.cmake   \
   AddUMFPackFlags.cmake    \
-  CheckCXX11Features.cmake \
+  CheckCXXFeatures.cmake   \
   DuneBoost.cmake \
   DuneCMakePackageConfigHelpers.cmake \
   DuneCommonMacros.cmake  \