diff --git a/CHANGES b/CHANGES
index 3b48c60ba2c2bdcf17a2f9da4ca7a504c47accf1..db6b182fccc8d89a68f1dd49aec00c08cda80808 100644
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,17 @@
 
                                   Changelog
 
+Yang Tse (7 Oct 2008)
+- Added --enable-optimize configure option to enable and disable compiler
+  optimizations to allow decoupled setting from --enable-debug.
+
+Yang Tse (2 Oct 2008)
+- Added --enable-warnings configure option to enable and disable strict
+  compiler warnings to allow decoupled setting from --enable-debug.
+
+  runtests.pl will now run with picky compiler warnings enabled unless
+  explicitly disabled.
+  
 Daniel Fandrich (1 Oct 2008)
 - "make clean" now cleans out the docs and tests directories, too.
 
diff --git a/ares/CHANGES b/ares/CHANGES
index d786d4500de308b4eb2cfb8c82386ad0370a6833..68ec05d5a38521050e100e4e74df316cdd16665b 100644
--- a/ares/CHANGES
+++ b/ares/CHANGES
@@ -1,5 +1,13 @@
   Changelog for the c-ares project
 
+* Oct 7 2008 (Yang Tse)
+- Added --enable-optimize configure option to enable and disable compiler
+  optimizations to allow decoupled setting from --enable-debug.
+
+* Oct 2 2008 (Yang Tse)
+- Added --enable-warnings configure option to enable and disable strict
+  compiler warnings to allow decoupled setting from --enable-debug.
+
 * Sep 17 2008 (Yang Tse)
 - Code reorganization to allow internal/private use of "nameser.h" to any
   system that lacks arpa/nameser.h or arpa/nameser_compat.h header files.