diff --git a/gdb-aarch64-hw-break.patch b/gdb-aarch64-hw-break.patch
index 02240f9..900a83f 100644
--- a/gdb-aarch64-hw-break.patch
+++ b/gdb-aarch64-hw-break.patch
@@ -1,12 +1,10 @@
 http://permalink.gmane.org/gmane.comp.gdb.patches/88728
+http://permalink.gmane.org/gmane.comp.gdb.patches/90237
 
 Index: gdb/aarch64-linux-nat.c
 ===================================================================
-RCS file: /cvs/src/src/gdb/aarch64-linux-nat.c,v
-retrieving revision 1.4
-diff -u -p -r1.4 aarch64-linux-nat.c
---- gdb/aarch64-linux-nat.c	14 Feb 2013 13:50:30 -0000	1.4
-+++ gdb/aarch64-linux-nat.c	27 Jul 2013 22:42:18 -0000
+--- gdb/aarch64-linux-nat.c.orig
++++ gdb/aarch64-linux-nat.c
 @@ -312,6 +312,7 @@ aarch64_linux_set_debug_regs (const stru
    const CORE_ADDR *addr;
    const unsigned int *ctrl;
@@ -15,3 +13,15 @@ diff -u -p -r1.4 aarch64-linux-nat.c
    iov.iov_base = &regs;
    iov.iov_len = sizeof (regs);
    count = watchpoint ? aarch64_num_wp_regs : aarch64_num_bp_regs;
+Index: gdb/gdbserver/linux-aarch64-low.c
+===================================================================
+--- gdb/gdbserver/linux-aarch64-low.c.orig
++++ gdb/gdbserver/linux-aarch64-low.c
+@@ -600,6 +600,7 @@ aarch64_linux_set_debug_regs (const stru
+   const CORE_ADDR *addr;
+   const unsigned int *ctrl;
+ 
++  memset (&regs, 0, sizeof (regs));
+   iov.iov_base = &regs;
+   iov.iov_len = sizeof (regs);
+   count = watchpoint ? aarch64_num_wp_regs : aarch64_num_bp_regs;
diff --git a/gdb.changes b/gdb.changes
index 18f1bd9..fcde525 100644
--- a/gdb.changes
+++ b/gdb.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Sep 12 16:04:25 UTC 2013 - schwab@suse.de
+
+- gdb-aarch64-hw-break.patch: apply last change also to gdbserver
+
 -------------------------------------------------------------------
 Mon Aug 12 15:30:32 UTC 2013 - schwab@suse.de