diff --git a/board/hmi1001/Makefile b/board/manroland/hmi1001/Makefile
similarity index 100%
rename from board/hmi1001/Makefile
rename to board/manroland/hmi1001/Makefile
diff --git a/board/hmi1001/config.mk b/board/manroland/hmi1001/config.mk
similarity index 100%
rename from board/hmi1001/config.mk
rename to board/manroland/hmi1001/config.mk
diff --git a/board/hmi1001/hmi1001.c b/board/manroland/hmi1001/hmi1001.c
similarity index 100%
rename from board/hmi1001/hmi1001.c
rename to board/manroland/hmi1001/hmi1001.c
diff --git a/board/mucmc52/Makefile b/board/manroland/mucmc52/Makefile
similarity index 100%
rename from board/mucmc52/Makefile
rename to board/manroland/mucmc52/Makefile
diff --git a/board/mucmc52/config.mk b/board/manroland/mucmc52/config.mk
similarity index 100%
rename from board/mucmc52/config.mk
rename to board/manroland/mucmc52/config.mk
diff --git a/board/mucmc52/mucmc52.c b/board/manroland/mucmc52/mucmc52.c
similarity index 100%
rename from board/mucmc52/mucmc52.c
rename to board/manroland/mucmc52/mucmc52.c
diff --git a/board/uc100/Makefile b/board/manroland/uc100/Makefile
similarity index 100%
rename from board/uc100/Makefile
rename to board/manroland/uc100/Makefile
diff --git a/board/uc100/config.mk b/board/manroland/uc100/config.mk
similarity index 100%
rename from board/uc100/config.mk
rename to board/manroland/uc100/config.mk
diff --git a/board/uc100/pcmcia.c b/board/manroland/uc100/pcmcia.c
similarity index 100%
rename from board/uc100/pcmcia.c
rename to board/manroland/uc100/pcmcia.c
diff --git a/board/uc100/u-boot.lds b/board/manroland/uc100/u-boot.lds
similarity index 100%
rename from board/uc100/u-boot.lds
rename to board/manroland/uc100/u-boot.lds
diff --git a/board/uc100/u-boot.lds.debug b/board/manroland/uc100/u-boot.lds.debug
similarity index 100%
rename from board/uc100/u-boot.lds.debug
rename to board/manroland/uc100/u-boot.lds.debug
diff --git a/board/uc100/uc100.c b/board/manroland/uc100/uc100.c
similarity index 100%
rename from board/uc100/uc100.c
rename to board/manroland/uc100/uc100.c
diff --git a/board/uc101/Makefile b/board/manroland/uc101/Makefile
similarity index 100%
rename from board/uc101/Makefile
rename to board/manroland/uc101/Makefile
diff --git a/board/uc101/config.mk b/board/manroland/uc101/config.mk
similarity index 100%
rename from board/uc101/config.mk
rename to board/manroland/uc101/config.mk
diff --git a/board/uc101/uc101.c b/board/manroland/uc101/uc101.c
similarity index 100%
rename from board/uc101/uc101.c
rename to board/manroland/uc101/uc101.c
diff --git a/boards.cfg b/boards.cfg
index 02eb153..f55bd70 100644
--- a/boards.cfg
+++ b/boards.cfg
@@ -93,14 +93,14 @@ PATI		powerpc	mpc5xx		pati		mpl
 BC3450		powerpc	mpc5xxx		bc3450
 canmb		powerpc	mpc5xxx
 cm5200		powerpc	mpc5xxx
-hmi1001		powerpc	mpc5xxx
+hmi1001		powerpc	mpc5xxx		-		manroland
 inka4x0		powerpc	mpc5xxx
 ipek01		powerpc	mpc5xxx
 jupiter		powerpc	mpc5xxx
-mucmc52		powerpc	mpc5xxx
+mucmc52		powerpc	mpc5xxx		-		manroland
 munices		powerpc	mpc5xxx
 o2dnt		powerpc	mpc5xxx
-uc101		powerpc	mpc5xxx
+uc101		powerpc	mpc5xxx		-		manroland
 v38b		powerpc	mpc5xxx
 pf5200		powerpc	mpc5xxx		-		esd
 aev		powerpc	mpc5xxx		tqm5200		tqc
@@ -153,7 +153,7 @@ RBC823		powerpc	mpc8xx		rbc823
 rmu		powerpc	mpc8xx
 RPXlite		powerpc	mpc8xx
 spc1920		powerpc	mpc8xx
-uc100		powerpc	mpc8xx
+uc100		powerpc	mpc8xx		-		manroland
 MHPC		powerpc	mpc8xx		mhpc		eltec
 TOP860		powerpc	mpc8xx		top860		emk
 kmsupx4		powerpc	mpc8xx		km8xx		keymile