diff --git a/fs/Config.in b/fs/Config.in
index da4c5ff1b..585311342 100644
--- a/fs/Config.in
+++ b/fs/Config.in
@@ -11,5 +11,6 @@ source "fs/romfs/Config.in"
 source "fs/squashfs/Config.in"
 source "fs/tar/Config.in"
 source "fs/ubifs/Config.in"
+source "fs/yaffs2/Config.in"
 
 endmenu
diff --git a/fs/yaffs2/Config.in b/fs/yaffs2/Config.in
new file mode 100644
index 000000000..27da4ba63
--- /dev/null
+++ b/fs/yaffs2/Config.in
@@ -0,0 +1,4 @@
+config BR2_TARGET_ROOTFS_YAFFS2
+	bool "yaffs2 root filesystem"
+	help
+	  Build a yaffs2 root filesystem
diff --git a/fs/yaffs2/yaffs.mk b/fs/yaffs2/yaffs.mk
new file mode 100644
index 000000000..19bdbe842
--- /dev/null
+++ b/fs/yaffs2/yaffs.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# Build the yaffs2 root filesystem image
+#
+################################################################################
+
+ROOTFS_YAFFS2_DEPENDENCIES = host-yaffs2utils
+
+define ROOTFS_YAFFS2_CMD
+	$(HOST_DIR)/usr/bin/mkyaffs2 --all-root $(TARGET_DIR) $@
+endef
+
+$(eval $(call ROOTFS_TARGET,yaffs2))