diff --git a/include/configs/rpi-common.h b/include/configs/rpi-common.h
index e07fa6566e67a3b4154a3c2336eec7abb9efeb8a..2c3b02677a093a65d6456d488813e03aa4f79c6b 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 */