diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4199d4623..1809d4401 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -13,6 +13,13 @@
 
 cmake_minimum_required (VERSION 2.8.9)
 project (openclonk CXX C)
+
+# CMP0054: Only interpret if() arguments as variables or keywords when unquoted
+# (since CMake 3.1)
+if(POLICY CMP0054)
+	cmake_policy(SET CMP0054 NEW)
+endif()
+
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
 
 include(Version.txt)
diff --git a/cmake/CheckIncludeFilesCXX.cmake b/cmake/CheckIncludeFilesCXX.cmake
index fda3ad83d..2eeac7685 100644
--- a/cmake/CheckIncludeFilesCXX.cmake
+++ b/cmake/CheckIncludeFilesCXX.cmake
@@ -45,7 +45,7 @@
 #=============================================================================
 
 macro(CHECK_INCLUDE_FILES_CXX INCLUDE VARIABLE)
-  if("${VARIABLE}" MATCHES "^${VARIABLE}$")
+  if(NOT DEFINED "${VARIABLE}")
     set(CMAKE_CONFIGURABLE_FILE_CONTENT "/* */\n")
     if(CMAKE_REQUIRED_INCLUDES)
       set(CHECK_INCLUDE_FILES_INCLUDE_DIRS "-DINCLUDE_DIRECTORIES=${CMAKE_REQUIRED_INCLUDES}")