diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog
index 8c3b02e5e4..ac88a9d778 100644
--- a/gdb/gdbserver/ChangeLog
+++ b/gdb/gdbserver/ChangeLog
@@ -1,3 +1,8 @@
+2018-02-28  Sergio Durigan Junior  <sergiodj@redhat.com>
+
+	* server.c (captured_main): Change order of error message printed
+	when the current working directory cannot be found.
+
 2018-02-28  Sergio Durigan Junior  <sergiodj@redhat.com>
 
 	* server.c: Include "filenames.h" and "pathstuff.h".
diff --git a/gdb/gdbserver/server.c b/gdb/gdbserver/server.c
index 7745027628..f373d8a1e8 100644
--- a/gdb/gdbserver/server.c
+++ b/gdb/gdbserver/server.c
@@ -3573,7 +3573,7 @@ captured_main (int argc, char *argv[])
   current_directory = getcwd (NULL, 0);
   if (current_directory == NULL)
     {
-      error (_("%s: error finding working directory"),
+      error (_("Could not find current working directory: %s"),
 	     safe_strerror (errno));
     }