diff --git a/include/configs/rpi-common.h b/include/configs/rpi-common.h
index e07fa6566e..2c3b02677a 100644
--- a/include/configs/rpi-common.h
+++ b/include/configs/rpi-common.h
@@ -118,7 +118,7 @@
 #define CONFIG_PREBOOT			"usb start"
 
 /* Shell */
-#define CONFIG_SYS_MAXARGS		8
+#define CONFIG_SYS_MAXARGS		16
 #define CONFIG_COMMAND_HISTORY
 
 /* Commands */