diff --git a/MAINTAINERS b/MAINTAINERS
index 60def0c34d7775cb6b3cfbe610a224da075d2bf2..dfe54a7cb72315683eadacc1d7c7b12d3415113a 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -707,7 +707,7 @@ Yasushi Shoji <yashi@atmark-techno.com>
 
 Michal Simek <monstr@monstr.eu>
 
-	ML401		MicroBlaze
+	microblaze-generic	MicroBlaze
 
 #########################################################################
 # Coldfire Systems:							#
diff --git a/MAKEALL b/MAKEALL
index 5ce3f3112c94ad251586801741bcfa96acf8fddb..f6271a29f1f77ccf09de0e9e18435fad1b5d3c9b 100755
--- a/MAKEALL
+++ b/MAKEALL
@@ -697,9 +697,9 @@ LIST_nios2="		\
 ## MicroBlaze Systems
 #########################################################################
 
-LIST_microblaze="	\
-	ml401		\
-	suzaku		\
+LIST_microblaze="			\
+	microblaze-generic		\
+	suzaku				\
 "
 
 #########################################################################
diff --git a/Makefile b/Makefile
index d533564d9af051eb835cecaad5f8b3f917f89cac..5cc950dea5f32762a24f0dc5380d5fbc02c462ab 100644
--- a/Makefile
+++ b/Makefile
@@ -3170,10 +3170,9 @@ PCI5441_config : unconfig
 ## Microblaze
 #========================================================================
 
-ml401_config:	unconfig
+microblaze-generic_config:	unconfig
 	@mkdir -p $(obj)include
-	@echo "#define CONFIG_ML401 1" > $(obj)include/config.h
-	@$(MKCONFIG) -a $(@:_config=) microblaze microblaze ml401 xilinx
+	@$(MKCONFIG) -a $(@:_config=) microblaze microblaze microblaze-generic xilinx
 
 suzaku_config:	unconfig
 	@mkdir -p $(obj)include
diff --git a/board/xilinx/ml401/Makefile b/board/xilinx/microblaze-generic/Makefile
similarity index 100%
rename from board/xilinx/ml401/Makefile
rename to board/xilinx/microblaze-generic/Makefile
diff --git a/board/xilinx/ml401/config.mk b/board/xilinx/microblaze-generic/config.mk
similarity index 100%
rename from board/xilinx/ml401/config.mk
rename to board/xilinx/microblaze-generic/config.mk
diff --git a/board/xilinx/ml401/ml401.c b/board/xilinx/microblaze-generic/microblaze-generic.c
similarity index 100%
rename from board/xilinx/ml401/ml401.c
rename to board/xilinx/microblaze-generic/microblaze-generic.c
diff --git a/board/xilinx/ml401/u-boot.lds b/board/xilinx/microblaze-generic/u-boot.lds
similarity index 100%
rename from board/xilinx/ml401/u-boot.lds
rename to board/xilinx/microblaze-generic/u-boot.lds
diff --git a/board/xilinx/ml401/xparameters.h b/board/xilinx/microblaze-generic/xparameters.h
similarity index 100%
rename from board/xilinx/ml401/xparameters.h
rename to board/xilinx/microblaze-generic/xparameters.h
diff --git a/include/configs/ml401.h b/include/configs/microblaze-generic.h
similarity index 98%
rename from include/configs/ml401.h
rename to include/configs/microblaze-generic.h
index c802dcb6a2ae21bc4415d6f01a3bd2ebe0d18cb3..ed4bf6d359649090e2103563d94c9f243f15a096 100644
--- a/include/configs/ml401.h
+++ b/include/configs/microblaze-generic.h
@@ -25,11 +25,10 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
-#include "../board/xilinx/ml401/xparameters.h"
+#include "../board/xilinx/microblaze-generic/xparameters.h"
 
 #define	CONFIG_MICROBLAZE	1	/* MicroBlaze CPU */
 #define	MICROBLAZE_V5		1
-#define	CONFIG_ML401		1	/* ML401 Board */
 
 /* uart */
 #ifdef XILINX_UARTLITE_BASEADDR