diff --git a/CMakeLists.txt b/CMakeLists.txt
index 909a167daff35d3c96bcbb5978a5dcbf21ca4a07..b782156f3e8312fb75321e407a9ad836b723ab7d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -10,11 +10,6 @@
 
 cmake_minimum_required (VERSION 3.9)
 
-#+++++++++++++++++++++++++++++
-# for pre-defined standard path
-#
-include (GNUInstallDirs)
-
 #+++++++++++++++++++++++++++++
 # project name
 # version is:  "8.major.minor.patch"
@@ -30,6 +25,11 @@ project (
   LANGUAGES CXX
   )
 
+#+++++++++++++++++++++++++++++
+# for pre-defined standard path
+#
+include (GNUInstallDirs)
+
 #+++++++++++++++++++++++++++++
 # prevent in-source builds and give warning message
 #
@@ -44,12 +44,17 @@ endif ()
 # cmake version-specific settings
 #
 # https://cmake.org/cmake/help/latest/policy/CMP0079.html
-if (${CMAKE_VERSION} VERSION_GREATER "3.13.0")
-  cmake_policy (SET CMP0079 NEW)
-endif ()
 if (POLICY CMP0079)
     cmake_policy (SET CMP0079 NEW)
 endif ()
+# Download timestamp for external modules
+if (POLICY CMP0135)
+    cmake_policy (SET CMP0135 OLD)
+endif ()
+# AUtomatically add extensions to filenames if needed (old behaviour)
+if (POLICY CMP0115)
+    cmake_policy (SET CMP0115 OLD)
+endif ()
 
 #+++++++++++++++++++++++++++++
 # warn user if system is not UNIX
@@ -384,7 +389,7 @@ configure_file (
 )
 #
 # second also for install-tree
-# 
+#
 set (CORSIKA_CMAKE_DATA_DIR "${CMAKE_INSTALL_FULL_DATADIR}/corsika/data")
 configure_file (
   src/corsika.hpp.in