diff --git a/ChangeLog b/ChangeLog
index 26feeb00728..029fcbba387 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -8094,3 +8094,6 @@
 	* arch/arm/Kconfig, src/sama5/sam_tickless.c, Kconfig, Make.defs: Use
 	  the one-shot and free-running timers to implement tickless OS support
 	  for SAMA5 (2014-8-9).
+	* arch/arm/src/sama5/sam_oneshot.c and sam_tc.c: Fix several bugs in
+	  timer/counter interrupt logic and one-shot timer logic.  Comments and
+	  debug output updated in additional files (2014-8-10).