diff --git a/CMakeLists.txt b/CMakeLists.txt
index 155450b88a6..7537076ba06 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -326,6 +326,12 @@ check_compiler_has_flag(
 	HAS_COMPILER_FLAG_WCXX_11_COMPAT
 )
 
+check_compiler_has_flag(
+	CXX_FLAGS_PEDANTIC_COMPILATION
+	"-Wnoexcept"
+	HAS_COMPILER_FLAG_WNOEXCEPT
+)
+
 
 ### Set the final compiler flags.
 
diff --git a/changelog b/changelog
index 58e611a69f8..8c4cfdef9d5 100644
--- a/changelog
+++ b/changelog
@@ -91,6 +91,7 @@ Version 1.11.0+svn:
    * Fix OOS when observe scenario 2 in a multiplayer campaign (bug #20217).
    * Synchronize underlying_unit_id in MP campaigns (bug #20227)
    * Fixed: Compilation with Boost 1.51.0 (Gentoo bug #440742).
+   * Added -Wnoexcept to the CMake pedantic flags.
 
 Version 1.11.0:
  * Add-ons client: