diff --git a/CMakeLists.txt b/CMakeLists.txt
index 77543459366..c8e3698dfe4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -113,9 +113,7 @@ if(CMAKE_COMPILER_IS_GNUCXX)
 	if(NOT CONFIGURED)
 
 		if(ENABLE_STRICT_COMPILATION)
-			# The current networking code breaks strict aliasing in g++ 4.5.
-			# Once the code is converted to boost::asio it might be reenabled.
-			set(STRICT_FLAGS "-Werror -Wno-strict-aliasing")
+			set(STRICT_FLAGS "-Werror")
 		else(ENABLE_STRICT_COMPILATION)
 			set(STRICT_FLAGS "")
 		endif(ENABLE_STRICT_COMPILATION)
diff --git a/changelog b/changelog
index ed7ba11813c..70dbac70e3e 100644
--- a/changelog
+++ b/changelog
@@ -39,6 +39,9 @@ Version 1.9.7+svn:
    * Fixed bug #18117, saved games with Qatif-al-nar became corrupted
    * Fixed bug #18120, where Khalifate units were not getting the default ALMA
    * Patch #2663: Make wesnoth-optipng work on systems with BSD stat
+   * CMake build system:
+     * Disabled building of libana by default
+     * Removed "-Wno-strict-aliasing" from the default compiler flags
 
 Version 1.9.7:
  * Graphics: