diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog
index 475a1aaca9..fac340e2f0 100644
--- a/gdb/gdbserver/ChangeLog
+++ b/gdb/gdbserver/ChangeLog
@@ -1,3 +1,7 @@
+2018-06-11  Alan Hayward  <alan.hayward@arm.com>
+
+	* server.h (PBUFSIZ): Increase size
+
 2018-06-11  Alan Hayward  <alan.hayward@arm.com>
 
 	* regcache.c (regcache::raw_compare): New function.
diff --git a/gdb/gdbserver/server.h b/gdb/gdbserver/server.h
index 9202df2948..8e197eef8f 100644
--- a/gdb/gdbserver/server.h
+++ b/gdb/gdbserver/server.h
@@ -113,7 +113,7 @@ extern int in_queued_stop_replies (ptid_t ptid);
 /* Buffer sizes for transferring memory, registers, etc.   Set to a constant
    value to accomodate multiple register formats.  This value must be at least
    as large as the largest register set supported by gdbserver.  */
-#define PBUFSIZ 16384
+#define PBUFSIZ 18432
 
 /* Definition for an unknown syscall, used basically in error-cases.  */
 #define UNKNOWN_SYSCALL (-1)