diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog
index ceb8c4d3e64..9519ed7b9a8 100644
--- a/gdb/gdbserver/ChangeLog
+++ b/gdb/gdbserver/ChangeLog
@@ -1,3 +1,9 @@
+2015-10-22  Antoine Tremblay  <antoine.tremblay@ericsson.com>
+
+	* linux-low.c (default_breakpoint_kind_from_pc): New function.
+	(linux_breakpoint_kind_from_pc): Use default_breakpoint_kind_from_pc for
+	the default breakpoint kind.
+
 2015-10-21  Antoine Tremblay  <antoine.tremblay@ericsson.com>
 
 	* linux-arm-low.c (arm_supports_z_point_type): Add software
diff --git a/gdb/gdbserver/linux-low.c b/gdb/gdbserver/linux-low.c
index c20e2571c69..ac8fae3dec8 100644
--- a/gdb/gdbserver/linux-low.c
+++ b/gdb/gdbserver/linux-low.c
@@ -6937,6 +6937,19 @@ current_lwp_ptid (void)
   return ptid_of (current_thread);
 }
 
+/* Return the default breakpoint kind as the size of the breakpoint.  */
+
+static int
+default_breakpoint_kind_from_pc (CORE_ADDR *pcptr)
+{
+  int size = 0;
+
+  gdb_assert (the_low_target.sw_breakpoint_from_kind != NULL);
+
+  (*the_low_target.sw_breakpoint_from_kind) (0, &size);
+  return size;
+}
+
 /* Implementation of the target_ops method "breakpoint_kind_from_pc".  */
 
 static int
@@ -6945,8 +6958,7 @@ linux_breakpoint_kind_from_pc (CORE_ADDR *pcptr)
   if (the_low_target.breakpoint_kind_from_pc != NULL)
     return (*the_low_target.breakpoint_kind_from_pc) (pcptr);
   else
-    /* Default breakpoint kind value.  */
-    return 0;
+    return default_breakpoint_kind_from_pc (pcptr);
 }
 
 /* Implementation of the target_ops method "sw_breakpoint_from_kind".  */