diff --git a/ChangeLog b/ChangeLog
index ad9dcff9c31..bbfbf7ce980 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -10601,4 +10601,15 @@
 	  for the SAMD21 family (2015-06-19).
 	* configs/samd21-xplained:  Board configuration for the SAMD21 Xplained
 	  bord (2015-06-21).
-
+	* arch/arm/src/sam34/sam_lowputc.c: Back out an error introduced with
+	  commit 02c33f66c5a8be774034cd40e4125e9323c7b4d8.  Causes an infinite
+	  loop in up_lowputc().  From Max Neklyudov (2015-06-22).
+	* include/nuttx/fs/ioctl.h and power/relay.h: Add relay IOCTL definitions.
+	  From Max Neklyudov (2015-06-22).
+	* sched/clock/clock_gettime.c: Use up_timer_gettime for CLOCK_MONOTONIC
+	  in tickless mode.  From  Max Neklyudov (2015-06-22).
+	* crypto/ and SAM4CM: Add CFB and MAC AES modes.  From Max Neklyudov
+	  (2015-06-22).
+	* SAM4CM: Fix SUPC register definitions. From Max Neklyudov.  Also
+	  removed conditional logic form non-SAM4CM parts (Gregory Nutt)
+	  (2015-06-22).