diff --git a/src/frontend/commands.c b/src/frontend/commands.c
index 7b2357b31..428655869 100644
--- a/src/frontend/commands.c
+++ b/src/frontend/commands.c
@@ -496,7 +496,7 @@ struct comm spcp_coms[] = {
       NULL,
       "[-r] [number] : Print command history." } ,
     { "echo", com_echo, FALSE, FALSE,
-      { 1, 1, 1, 1 }, E_DEFHMASK, 0, LOTS,
+      { 1, 1, 1, 1 }, E_DEFHMASK, 0, NLOTS,
       NULL,
       "[stuff ...] : Print stuff." } ,
     { "shell", com_shell, FALSE, TRUE,
diff --git a/src/include/ngspice/cpdefs.h b/src/include/ngspice/cpdefs.h
index e8b33f853..743b42c64 100644
--- a/src/include/ngspice/cpdefs.h
+++ b/src/include/ngspice/cpdefs.h
@@ -50,6 +50,7 @@ struct comm {
 };
 
 #define LOTS        1000
+#define NLOTS       10000
 
 /* The history list. Things get put here after the first (basic) parse.
  * The word list will change later, so be sure to copy it.