diff --git a/ChangeLog b/ChangeLog
index 967e7d81db..641634c6cc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6240,4 +6240,6 @@
 	  frontends configuration tools (if you built them) (2013-12-16)
 	* arch/arm/src/armv7-a/arm_head.h:  Fixe some errors in the cache
 	  invalidation logic (only seem to matter for Cortex-A8) (21-3-12-19).
-
+	* Kconfig and all Make.defs files:  Add CONFIG_DEBUG_NOOPT.  Now
+	  you can indepenently enable/disable debug symbols and optimization
+	  (2013-12-20).
diff --git a/arch/arm/src/armv7-m/up_exception.S b/arch/arm/src/armv7-m/up_exception.S
index ec2ed4dd7a..a40ddf66fe 100644
--- a/arch/arm/src/armv7-m/up_exception.S
+++ b/arch/arm/src/armv7-m/up_exception.S
@@ -229,7 +229,7 @@ exception_common:
 	/* Restore the interrupt state */
 
 #ifdef CONFIG_ARMV7M_USEBASEPRI
-	msr		basepri, r3				/* Restore interrupts priority masking*/
+	msr		basepri, r3				/* Restore interrupts priority masking */
 	cpsie	i						/* Re-enable interrupts */
 #else
 	msr		primask, r3				/* Restore interrupts */
diff --git a/arch/arm/src/kinetis/kinetis_vectors.S b/arch/arm/src/kinetis/kinetis_vectors.S
index e10b7604a2..7508d077a8 100644
--- a/arch/arm/src/kinetis/kinetis_vectors.S
+++ b/arch/arm/src/kinetis/kinetis_vectors.S
@@ -765,7 +765,7 @@ kinetis_common:
     /* Restore the interrupt state */
 
 #ifdef CONFIG_ARMV7M_USEBASEPRI
-	msr		basepri, r3				/* Restore interrupts priority masking*/
+	msr		basepri, r3				/* Restore interrupts priority masking */
 	cpsie	i						/* Re-enable interrupts */
 #else
 	msr		primask, r3				/* Restore interrupts */
diff --git a/arch/arm/src/lm/lm_vectors.S b/arch/arm/src/lm/lm_vectors.S
index 17cc34719a..e48f8833b7 100644
--- a/arch/arm/src/lm/lm_vectors.S
+++ b/arch/arm/src/lm/lm_vectors.S
@@ -368,7 +368,7 @@ lm_irqcommon:
     /* Restore the interrupt state */
 
 #ifdef CONFIG_ARMV7M_USEBASEPRI
-	msr		basepri, r3				/* Restore interrupts priority masking*/
+	msr		basepri, r3				/* Restore interrupts priority masking */
 	cpsie	i						/* Re-enable interrupts */
 #else
 	msr		primask, r3				/* Restore interrupts */
diff --git a/arch/arm/src/lpc17xx/lpc17_vectors.S b/arch/arm/src/lpc17xx/lpc17_vectors.S
index b36f331387..c0b79b0486 100644
--- a/arch/arm/src/lpc17xx/lpc17_vectors.S
+++ b/arch/arm/src/lpc17xx/lpc17_vectors.S
@@ -377,7 +377,7 @@ lpc17_common:
     /* Restore the interrupt state */
 
 #ifdef CONFIG_ARMV7M_USEBASEPRI
-	msr		basepri, r3				/* Restore interrupts priority masking*/
+	msr		basepri, r3				/* Restore interrupts priority masking */
 	cpsie	i						/* Re-enable interrupts */
 #else
 	msr		primask, r3				/* Restore interrupts */
diff --git a/arch/arm/src/sam34/sam_vectors.S b/arch/arm/src/sam34/sam_vectors.S
index abf373bf18..490a81a7a3 100644
--- a/arch/arm/src/sam34/sam_vectors.S
+++ b/arch/arm/src/sam34/sam_vectors.S
@@ -383,7 +383,7 @@ sam_common:
     /* Restore the interrupt state */
 
 #ifdef CONFIG_ARMV7M_USEBASEPRI
-	msr		basepri, r3				/* Restore interrupts priority masking*/
+	msr		basepri, r3				/* Restore interrupts priority masking */
 	cpsie	i						/* Re-enable interrupts */
 #else
 	msr		primask, r3				/* Restore interrupts */
diff --git a/arch/arm/src/stm32/stm32_vectors.S b/arch/arm/src/stm32/stm32_vectors.S
index e1dbb5662e..d16192f719 100644
--- a/arch/arm/src/stm32/stm32_vectors.S
+++ b/arch/arm/src/stm32/stm32_vectors.S
@@ -390,7 +390,7 @@ stm32_common:
     /* Restore the interrupt state */
 
 #ifdef CONFIG_ARMV7M_USEBASEPRI
-	msr		basepri, r3				/* Restore interrupts priority masking*/
+	msr		basepri, r3				/* Restore interrupts priority masking */
 	cpsie	i						/* Re-enable interrupts */
 #else
 	msr		primask, r3				/* Restore interrupts */