diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog
index a071642614..4397ff9603 100644
--- a/gdb/gdbserver/ChangeLog
+++ b/gdb/gdbserver/ChangeLog
@@ -1,3 +1,8 @@
+2015-10-29  Simon Marchi  <simon.marchi@polymtl.ca>
+
+	* server.c (handle_search_memory_1): Cast return value of
+	memmem.
+
 2015-10-29  Simon Marchi  <simon.marchi@polymtl.ca>
 
 	* server.c (write_qxfer_response): Change type of data to
diff --git a/gdb/gdbserver/server.c b/gdb/gdbserver/server.c
index b2f0f6789a..fd2804beaa 100644
--- a/gdb/gdbserver/server.c
+++ b/gdb/gdbserver/server.c
@@ -891,7 +891,8 @@ handle_search_memory_1 (CORE_ADDR start_addr, CORE_ADDR search_space_len,
 				  ? search_space_len
 				  : search_buf_size);
 
-      found_ptr = memmem (search_buf, nr_search_bytes, pattern, pattern_len);
+      found_ptr = (gdb_byte *) memmem (search_buf, nr_search_bytes, pattern,
+				       pattern_len);
 
       if (found_ptr != NULL)
 	{