 -	"mtdparts="CONFIG_MTDPARTS					\
 -	"kernel=/boot/zImage\0"						\
 -	"fdt=/boot/guruplug-server-plus.dtb\0"				\
+-	"bootargs_root=ubi.mtd=2 root=ubi0:rootfs rootfstype=ubifs rw\0"
 +	"console=console=ttyS0,115200\0" \
 +	"script=bootscript\0" \
 +	"mtdids=nand0=orion_nand\0" \

diff --git a/include/configs/guruplug.h b/include/configs/guruplug.h
index 5f09567..27cfafd 100644
--- a/include/configs/guruplug.h
+++ b/include/configs/guruplug.h
@@ -49,7 +49,6 @@

 #define CONFIG_CMD_MII
 #define CONFIG_CMD_NAND
 #define CONFIG_CMD_PING
@@ -82,27 +81,38 @@
  * Default environment variables
  */
 #define CONFIG_BOOTCOMMAND \
