diff --git a/CHANGELOG b/CHANGELOG
index b95f66f45..6dcf21f90 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,8 @@
 #Nmap Changelog ($Id$); -*-text-*-
 
+o [GH#1659] Allow resuming nmap scan with lengthy command line
+  [Clément Notin]
+
 o [NSE] New library, oops.lua, makes reporting errors easy, with plenty of
   debugging detail when needed, and no clutter when not. [Daniel Miller]
 
diff --git a/nmap.cc b/nmap.cc
index 6c4d32f62..7b6928e4f 100644
--- a/nmap.cc
+++ b/nmap.cc
@@ -2336,7 +2336,7 @@ int nmap_main(int argc, char *argv[]) {
 int gather_logfile_resumption_state(char *fname, int *myargc, char ***myargv) {
   char *filestr;
   int filelen;
-  char nmap_arg_buffer[1024];
+  char nmap_arg_buffer[128*1024]; /* roughly aligned with Linux limit */
   struct in_addr lastip;
   char *p, *q, *found, *lastipstr; /* I love C! */
   /* We mmap it read/write since we will change the last char to a newline if it is not already */