 +		"run bootscript;\0" \
 +	"bootscript=echo Running bootscript ...; " \
 +		"source ${scriptaddr}\0" \
-+	"bootargs_base=${console} ${mtdparts} oops=panic panic=5 ${smp} rootwait consoleblank=0\0"	\
- 	"bootargs_root=ubi.mtd=2 root=ubi0:rootfs rootfstype=ubifs rw\0"
++	"bootargs_base=${console} ${mtdparts} oops=panic panic=5 ${smp} rootwait consoleblank=0\0" \
++	"bootargs_ubi=ubi.mtd=2 ubi.block=0,2 ubi.block=0,3\0"
  
  #define MTDIDS_DEFAULT	"nand0=orion_nand"
+ 

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

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