diff --git a/include/image.mk b/include/image.mk
index 9b3b3f2..a5f697c 100644
--- a/include/image.mk
+++ b/include/image.mk
@@ -279,6 +279,7 @@ endif
 define Image/mkfs/ubifs
 	$(STAGING_DIR_HOST)/bin/mkfs.ubifs \
 		$(UBIFS_OPTS) $(call param_unmangle,$(call param_get,fs,$(1))) \
+		-m 2048 -e 126976 -c 1024 \
 		$(if $(CONFIG_TARGET_UBIFS_FREE_SPACE_FIXUP),--space-fixup) \
 		$(if $(CONFIG_TARGET_UBIFS_COMPRESSION_NONE),--compr=none) \
 		$(if $(CONFIG_TARGET_UBIFS_COMPRESSION_LZO),--compr=lzo) \
diff --git a/target/linux/ath79/nand/target.mk b/target/linux/ath79/nand/target.mk
index c565c9b..a40884f 100644
--- a/target/linux/ath79/nand/target.mk
+++ b/target/linux/ath79/nand/target.mk
@@ -1,6 +1,6 @@
 BOARDNAME := Generic devices with NAND flash
 
-FEATURES += squashfs nand
+FEATURES += squashfs nand ubifs
 
 DEFAULT_PACKAGES += wpad-basic