diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 40d9f0d87e2..0fe15efe69b 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,11 @@
+2018-09-19  Stefan Teleman <stefan.teleman@oracle.com>
+	    April Chin <april.chin@oracle.com>
+	    Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
+
+	* procfs.c (MAX_PROC_NAME_SIZE): Allow for 6-digit PID_MAX and
+	uint_t lwpid_t.
+	(create_procinfo): Print pids in /proc without leading zeros.
+
 2018-09-18  Sandra Loosemore  <sandra@codesourcery.com>
 
 	* nios2-tdep.c (nios2_gcc_target_options): New.
diff --git a/gdb/procfs.c b/gdb/procfs.c
index 66a3197b1fc..e66c46992af 100644
--- a/gdb/procfs.c
+++ b/gdb/procfs.c
@@ -231,7 +231,7 @@ enum { READ_WATCHFLAG  = WA_READ,
 #define AS_PROC_NAME_FMT     "/proc/%d/as"
 #define MAP_PROC_NAME_FMT    "/proc/%d/map"
 #define STATUS_PROC_NAME_FMT "/proc/%d/status"
-#define MAX_PROC_NAME_SIZE sizeof("/proc/99999/lwp/8096/lstatus")
+#define MAX_PROC_NAME_SIZE sizeof("/proc/999999/lwp/0123456789/lwpstatus")
 
 typedef struct procinfo {
   struct procinfo *next;
@@ -480,7 +480,7 @@ create_procinfo (int pid, int tid)
     }
   else
     {
-      sprintf (pi->pathname, "/proc/%05d/lwp/%d", pid, tid);
+      sprintf (pi->pathname, "/proc/%d/lwp/%d", pid, tid);
       pi->next = parent->thread_list;
       parent->thread_list = pi;
     }