diff --git a/board/nanopi-neo/boot.cmd b/board/friendlyarm/nanopi-neo/boot.cmd
similarity index 100%
rename from board/nanopi-neo/boot.cmd
rename to board/friendlyarm/nanopi-neo/boot.cmd
diff --git a/board/nanopi-neo/genimage.cfg b/board/friendlyarm/nanopi-neo/genimage.cfg
similarity index 100%
rename from board/nanopi-neo/genimage.cfg
rename to board/friendlyarm/nanopi-neo/genimage.cfg
diff --git a/board/nanopi-neo/post-build.sh b/board/friendlyarm/nanopi-neo/post-build.sh
similarity index 100%
rename from board/nanopi-neo/post-build.sh
rename to board/friendlyarm/nanopi-neo/post-build.sh
diff --git a/board/nanopi-neo/post-image.sh b/board/friendlyarm/nanopi-neo/post-image.sh
similarity index 100%
rename from board/nanopi-neo/post-image.sh
rename to board/friendlyarm/nanopi-neo/post-image.sh
diff --git a/board/nanopi-neo/readme.txt b/board/friendlyarm/nanopi-neo/readme.txt
similarity index 100%
rename from board/nanopi-neo/readme.txt
rename to board/friendlyarm/nanopi-neo/readme.txt
diff --git a/configs/nanopi_neo_defconfig b/configs/nanopi_neo_defconfig
index fbc0902e52..a22705269d 100644
--- a/configs/nanopi_neo_defconfig
+++ b/configs/nanopi_neo_defconfig
@@ -4,8 +4,8 @@ BR2_ARM_FPU_VFPV4=y
 
 BR2_TARGET_GENERIC_HOSTNAME="nanopi-neo"
 BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the NanoPi NEO"
-BR2_ROOTFS_POST_BUILD_SCRIPT="board/nanopi-neo/post-build.sh"
-BR2_ROOTFS_POST_IMAGE_SCRIPT="board/nanopi-neo/post-image.sh"
+BR2_ROOTFS_POST_BUILD_SCRIPT="board/friendlyarm/nanopi-neo/post-build.sh"
+BR2_ROOTFS_POST_IMAGE_SCRIPT="board/friendlyarm/nanopi-neo/post-image.sh"
 
 # Linux headers same as kernel, a 4.10 series
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_10=y