diff --git a/MAKEALL b/MAKEALL
index fe284b5ee23f937666421767c72e074ca5c87829..fbdcb42438051049e3c392c7b16a33d5aab3fd36 100755
--- a/MAKEALL
+++ b/MAKEALL
@@ -320,7 +320,7 @@ LIST_8260="		\
 
 LIST_83xx="		\
 	MPC8313ERDB_33	\
-	MPC8313ERDB_66	\
+	MPC8313ERDB_NAND_66	\
 	MPC8315ERDB	\
 	MPC8323ERDB	\
 	MPC832XEMDS	\
diff --git a/Makefile b/Makefile
index 2d4b51316aef322031cac219bf7eeccc1e591d20..8d82ef58ba6f779a5bd5bf26c231f42a7b02ee9a 100644
--- a/Makefile
+++ b/Makefile
@@ -2083,6 +2083,9 @@ MPC8313ERDB_NAND_66_config: unconfig
 		echo "#define CONFIG_NAND_U_BOOT" >>$(obj)include/config.h ; \
 	fi ;
 	@$(MKCONFIG) -a MPC8313ERDB ppc mpc83xx mpc8313erdb freescale
+	@if [ "$(findstring _NAND_,$@)" ] ; then \
+		echo "CONFIG_NAND_U_BOOT = y" >> $(obj)include/config.mk ; \
+	fi ;
 
 MPC8315ERDB_config: unconfig
 	@$(MKCONFIG) -a MPC8315ERDB ppc mpc83xx mpc8315erdb freescale