diff --git a/gdb/ChangeLog.arm b/gdb/ChangeLog.arm
index e3b32556ee7..e65f000eebb 100644
--- a/gdb/ChangeLog.arm
+++ b/gdb/ChangeLog.arm
@@ -1,11 +1,30 @@
-2016-03-29  Andre Vieira  <andre.simoesdiasvieira@arm.com>
-    Backport from mainline
-    2015-07-17  Yao Qi  <yao.qi@linaro.org>
-    * remote.c (get_current_thread): Initialise ptid to null_ptid.
-    (add_current_inferior_and_thread): Don't initialise ptid.
-2016-02-16  Andre Vieira  <andre.simoesdiasvieira@arm.com>
-    Backport from mainline
-    2016-02-04  Yao Qi  <yao.qi@linaro.org>
+2016-06-20  Thomas Preud'homme  <thomas.preudhomme@arm.com>
 
-    * remote.c (remote_wait_as): Set rs->waiting_for_stop_reply to
-    0 before handling 'F' and set it back afterwards.
+	Backport from mainline
+	2016-05-23  Yao Qi  <yao.qi@arm.com>
+
+	* arch-utils.c (default_code_of_frame_writable): New function.
+	* arch-utils.h (default_code_of_frame_writable): Declare.
+	* arm-tdep.c (arm_code_of_frame_writable): New function.
+	(arm_gdbarch_init): Install gdbarch method
+	code_of_frame_writable if the target is M-profile.
+	* frame.c (skip_unwritable_frames): New function.
+	* frame.h (skip_unwritable_frames): Declare.
+	* gdbarch.sh (code_of_frame_writable): New.
+	* gdbarch.c, gdbarch.h: Re-generated.
+	* infcmd.c (finish_command): Call skip_unwritable_frames.
+
+2016-03-29  Andre Vieira  <andre.simoesdiasvieira@arm.com>
+
+	Backport from mainline
+	2015-07-17  Yao Qi  <yao.qi@linaro.org>
+	* remote.c (get_current_thread): Initialise ptid to null_ptid.
+	(add_current_inferior_and_thread): Don't initialise ptid.
+
+2016-02-16  Andre Vieira  <andre.simoesdiasvieira@arm.com>
+
+	Backport from mainline
+	2016-02-04  Yao Qi  <yao.qi@linaro.org>
+
+	* remote.c (remote_wait_as): Set rs->waiting_for_stop_reply to
+	0 before handling 'F' and set it back afterwards.