diff --git a/package/system/fstools/Makefile b/package/system/fstools/Makefile
index b10f105a741f7bdd830869960a1ca950bd39ab84..08b3be478f84a6d00daf1e97ee9fd539c9dca6da 100644
--- a/package/system/fstools/Makefile
+++ b/package/system/fstools/Makefile
@@ -32,16 +32,10 @@ TARGET_LDFLAGS += $(if $(CONFIG_USE_EGLIBC),-lrt)
 define Package/fstools
   SECTION:=base
   CATEGORY:=Base system
-  DEPENDS:=+ubox +USE_EGLIBC:librt
+  DEPENDS:=+ubox +USE_EGLIBC:librt +NAND_SUPPORT:ubi-utils
   TITLE:=OpenWrt filesystem tools
 endef
 
-define Package/ubi-flash
-  SECTION:=base
-  CATEGORY:=Base system
-  TITLE:=OpenWrt ubi flashing tool
-endef
-
 define Package/block-mount
   SECTION:=base
   CATEGORY:=Base system
@@ -58,12 +52,6 @@ define Package/fstools/install
 	ln -s /sbin/jffs2reset $(1)/sbin/jffs2mark
 endef
 
-define Package/ubi-flash/install
-	$(INSTALL_DIR) $(1)/sbin $(1)/lib
-
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/ubi $(1)/sbin/
-endef
-
 define Package/block-mount/install
 	$(INSTALL_DIR) $(1)/sbin $(1)/lib $(1)/usr/sbin $(1)/etc/hotplug.d/block $(1)/etc/init.d/ $(1)/etc/uci-defaults/
 
@@ -86,5 +74,4 @@ define Build/InstallDev
 endef
 
 $(eval $(call BuildPackage,fstools))
-$(eval $(call BuildPackage,ubi-flash))
 $(eval $(call BuildPackage,block-mount))