diff --git a/src/misc.c b/src/misc.c
index 11a68709..46bebf8c 100644
--- a/src/misc.c
+++ b/src/misc.c
@@ -1215,10 +1215,12 @@ StrConcatDot(char *a, char *b)
 }
 
 
+#define MAX_CMD_SIZE 4096
+
 Bool
 GetCommandForPid(int pid, char ***argv, int *argc)
 {
-    char buf[1024];
+    static char buf[MAX_CMD_SIZE];
     FILE *fPtr;
     int count, i, j;
     Bool ok= False;
@@ -1226,9 +1228,9 @@ GetCommandForPid(int pid, char ***argv, int *argc)
     sprintf(buf, "/proc/%d/cmdline", pid);
     fPtr = fopen(buf, "r");
     if (fPtr) {
-        count = read(fileno(fPtr), buf, 1024);
+        count = read(fileno(fPtr), buf, MAX_CMD_SIZE);
         if (count > 0) {
-            buf[count] = 0;
+            buf[count-1] = 0;
             for (i=0, *argc=0; i<count; i++) {
                 if (buf[i] == 0) {
                     (*argc)++;
@@ -1246,6 +1248,9 @@ GetCommandForPid(int pid, char ***argv, int *argc)
                     if (i < count-1) {
                         (*argv)[j++] = &buf[i+1];
                     }
+                    if (j == *argc) {
+                        break;
+                    }
                 }
                 ok= True;
             }
diff --git a/src/wconfig.h.in b/src/wconfig.h.in
index 2f110867..2d10d469 100644
--- a/src/wconfig.h.in
+++ b/src/wconfig.h.in
@@ -515,8 +515,6 @@
 
 #define MAX_RESTART_ARGS	16
 
-#define MAX_COMMAND_SIZE	1024
-
 #define MAX_DEAD_PROCESSES	128