diff --git a/CHANGES b/CHANGES
index 32fef07e9653720bb2ffefc4aa9c57468d78a494..3384196f7043b23d36a55ac821a674f1aa1b7205 100644
--- a/CHANGES
+++ b/CHANGES
@@ -118,6 +118,22 @@ Chan_dahdi changes
  * Added dialtone_detect option for analog ports to disconnect incoming
    calls when dialtone is detected.
 
+------------------------------------------------------------------------------
+--- Functionality changes since Asterisk 10.4.0 ------------------------------
+------------------------------------------------------------------------------
+
+Build System
+------------
+ * The optimization portion of the build system has been reworked to avoid
+   broken builds on certain architectures.  All architecture-specific
+   optimization has been removed in favor of using -march=native to allow gcc
+   to detect the environment in which it is running when possible.  This can
+   be toggled as BUILD_NATIVE under "Compiler Flags" in menuselect.
+
+------------------------------------------------------------------------------
+--- Functionality changes since Asterisk 10.3.0 ------------------------------
+------------------------------------------------------------------------------
+
 Chan_unistim changes
 --------------------
  * Added ability to use multiple lines on phone, so for one device in 
diff --git a/UPGRADE-1.8.txt b/UPGRADE-1.8.txt
index d83d031451aca698370b1b824f941f9c2dc79764..2adaa7809fac472a0ede4eda0d18f7ecf534e77e 100644
--- a/UPGRADE-1.8.txt
+++ b/UPGRADE-1.8.txt
@@ -18,6 +18,11 @@
 ===
 ===========================================================
 
+From 1.8.12 to 1.8.13:
+* The complex processor detection and optimization has been removed from
+  the makefile in favor of using native optimization suppport when available.
+  BUILD_NATIVE can be disabled via menuselect under "Compiler Flags".
+
 From 1.8.10 to 1.8.11:
 
 * If no transport is specified in sip.conf, transport will default to UDP.
diff --git a/UPGRADE-10.txt b/UPGRADE-10.txt
index ac48c1b6f5f75464e02503af33f1ddaae44be648..35a9fcb2b129e73b94d6c59ae98fc8608d779629 100644
--- a/UPGRADE-10.txt
+++ b/UPGRADE-10.txt
@@ -19,6 +19,12 @@
 ===
 ===========================================================
 
+From 10.4 to 10.5:
+
+* The complex processor detection and optimization has been removed from
+  the makefile in favor of using native optimization suppport when available.
+  BUILD_NATIVE can be disabled via menuselect under "Compiler Flags".
+
 From 10.2 to 10.3:
 
 * If no transport is specified in sip.conf, transport will default to UDP.