diff --git a/Makefile b/Makefile
index 5b1e56872e..5e7bd6323d 100644
--- a/Makefile
+++ b/Makefile
@@ -2815,10 +2815,10 @@ scb9328_config	:	unconfig
 	@$(MKCONFIG) $(@:_config=) arm arm920t scb9328 NULL imx
 
 smdk2400_config	:	unconfig
-	@$(MKCONFIG) $(@:_config=) arm arm920t smdk2400 NULL s3c24x0
+	@$(MKCONFIG) $(@:_config=) arm arm920t smdk2400 samsung s3c24x0
 
 smdk2410_config	:	unconfig
-	@$(MKCONFIG) $(@:_config=) arm arm920t smdk2410 NULL s3c24x0
+	@$(MKCONFIG) $(@:_config=) arm arm920t smdk2410 samsung s3c24x0
 
 SX1_config :		unconfig
 	@$(MKCONFIG) $(@:_config=) arm arm925t sx1
diff --git a/board/smdk2400/Makefile b/board/samsung/smdk2400/Makefile
similarity index 100%
rename from board/smdk2400/Makefile
rename to board/samsung/smdk2400/Makefile
diff --git a/board/smdk2400/config.mk b/board/samsung/smdk2400/config.mk
similarity index 100%
rename from board/smdk2400/config.mk
rename to board/samsung/smdk2400/config.mk
diff --git a/board/smdk2400/flash.c b/board/samsung/smdk2400/flash.c
similarity index 100%
rename from board/smdk2400/flash.c
rename to board/samsung/smdk2400/flash.c
diff --git a/board/smdk2400/lowlevel_init.S b/board/samsung/smdk2400/lowlevel_init.S
similarity index 100%
rename from board/smdk2400/lowlevel_init.S
rename to board/samsung/smdk2400/lowlevel_init.S
diff --git a/board/smdk2400/smdk2400.c b/board/samsung/smdk2400/smdk2400.c
similarity index 100%
rename from board/smdk2400/smdk2400.c
rename to board/samsung/smdk2400/smdk2400.c
diff --git a/board/smdk2400/u-boot.lds b/board/samsung/smdk2400/u-boot.lds
similarity index 100%
rename from board/smdk2400/u-boot.lds
rename to board/samsung/smdk2400/u-boot.lds
diff --git a/board/smdk2410/Makefile b/board/samsung/smdk2410/Makefile
similarity index 100%
rename from board/smdk2410/Makefile
rename to board/samsung/smdk2410/Makefile
diff --git a/board/smdk2410/config.mk b/board/samsung/smdk2410/config.mk
similarity index 100%
rename from board/smdk2410/config.mk
rename to board/samsung/smdk2410/config.mk
diff --git a/board/smdk2410/flash.c b/board/samsung/smdk2410/flash.c
similarity index 100%
rename from board/smdk2410/flash.c
rename to board/samsung/smdk2410/flash.c
diff --git a/board/smdk2410/lowlevel_init.S b/board/samsung/smdk2410/lowlevel_init.S
similarity index 100%
rename from board/smdk2410/lowlevel_init.S
rename to board/samsung/smdk2410/lowlevel_init.S
diff --git a/board/smdk2410/smdk2410.c b/board/samsung/smdk2410/smdk2410.c
similarity index 100%
rename from board/smdk2410/smdk2410.c
rename to board/samsung/smdk2410/smdk2410.c
diff --git a/board/smdk2410/u-boot.lds b/board/samsung/smdk2410/u-boot.lds
similarity index 100%
rename from board/smdk2410/u-boot.lds
rename to board/samsung/smdk2410/u-boot.lds