diff --git a/board/atstk1000/Makefile b/board/atmel/atstk1000/Makefile
similarity index 100%
rename from board/atstk1000/Makefile
rename to board/atmel/atstk1000/Makefile
diff --git a/board/atstk1000/atstk1000.c b/board/atmel/atstk1000/atstk1000.c
similarity index 100%
rename from board/atstk1000/atstk1000.c
rename to board/atmel/atstk1000/atstk1000.c
diff --git a/board/atstk1000/config.mk b/board/atmel/atstk1000/config.mk
similarity index 69%
rename from board/atstk1000/config.mk
rename to board/atmel/atstk1000/config.mk
index a72c80e2f9..ec3618d56a 100644
--- a/board/atstk1000/config.mk
+++ b/board/atmel/atstk1000/config.mk
@@ -1,4 +1,4 @@
 PLATFORM_RELFLAGS	+= -ffunction-sections -fdata-sections
 PLATFORM_LDFLAGS	+= --gc-sections
 TEXT_BASE		= 0x00000000
-LDSCRIPT		= $(obj)board/atstk1000/u-boot.lds
+LDSCRIPT		= $(obj)board/atmel/atstk1000/u-boot.lds
diff --git a/board/atstk1000/flash.c b/board/atmel/atstk1000/flash.c
similarity index 100%
rename from board/atstk1000/flash.c
rename to board/atmel/atstk1000/flash.c
diff --git a/board/atstk1000/u-boot.lds.S b/board/atmel/atstk1000/u-boot.lds.S
similarity index 100%
rename from board/atstk1000/u-boot.lds.S
rename to board/atmel/atstk1000/u-boot.lds.S