diff --git a/apps/nshlib/nsh.h b/apps/nshlib/nsh.h
index dac91ba05d..e6dd2683b2 100644
--- a/apps/nshlib/nsh.h
+++ b/apps/nshlib/nsh.h
@@ -234,9 +234,11 @@
 #endif
 
 /* This is the maximum number of arguments that will be accepted for a command */
-
-#define NSH_MAX_ARGUMENTS 6
-
+#ifdef CONFIG_NSH_MAX_ARGUMENTS
+#  define NSH_MAX_ARGUMENTS CONFIG_NSH_MAX_ARGUMENTS
+#else
+#  define NSH_MAX_ARGUMENTS 10
+#endif
 /* strerror() produces much nicer output but is, however, quite large and
  * will only be used if CONFIG_NSH_STRERROR is defined.  Note that the strerror
  * interface must also have been enabled with CONFIG_LIBC_STRERROR.
diff --git a/nuttx/configs/px4fmu/nsh/defconfig b/nuttx/configs/px4fmu/nsh/defconfig
index bc1543d569..e1ba862cf7 100755
--- a/nuttx/configs/px4fmu/nsh/defconfig
+++ b/nuttx/configs/px4fmu/nsh/defconfig
@@ -941,6 +941,7 @@ CONFIG_CDCACM_PRODUCTSTR="PX4 FMU v1.6"
 # CONFIG_NSH_FILEIOSIZE - Size of a static I/O buffer
 # CONFIG_NSH_STRERROR - Use strerror(errno)
 # CONFIG_NSH_LINELEN - Maximum length of one command line
+# CONFIG_NSH_MAX_ARGUMENTS - Maximum number of arguments for command line
 # CONFIG_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
 # CONFIG_NSH_DISABLESCRIPT - Disable scripting support
 # CONFIG_NSH_DISABLEBG - Disable background commands
@@ -972,6 +973,7 @@ CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_STRERROR=y
 CONFIG_NSH_LINELEN=128
+CONFIG_NSH_MAX_ARGUMENTS=12
 CONFIG_NSH_NESTDEPTH=8
 CONFIG_NSH_DISABLESCRIPT=n
 CONFIG_NSH_DISABLEBG=n