diff --git a/BoardConfig.mk b/BoardConfig.mk
index 6fd4b4c..5089531 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -29,7 +29,8 @@ LZMA_RAMDISK_TARGETS := recovery
 BOARD_HAVE_QCOM_FM := true
 BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := $(DEVICE_PATH)/bluetooth
 
-# Miscellaneous
+# Recovery
 TARGET_RECOVERY_DENSITY := hdpi
+TARGET_RECOVERY_FSTAB := $(DEVICE_PATH)/rootdir/etc/fstab.qcom
 
 -include vendor/samsung/rubenslte/BoardConfigVendor.mk
diff --git a/recovery.fstab b/recovery.fstab
deleted file mode 100644
index 43a5b4a..0000000
--- a/recovery.fstab
+++ /dev/null
@@ -1,14 +0,0 @@
-/dev/block/platform/msm_sdcc.1/by-name/boot		/boot		emmc	defaults		recoveryonly
-/dev/block/platform/msm_sdcc.1/by-name/recovery		/recovery       emmc	defaults		recoveryonly
-/dev/block/platform/msm_sdcc.1/by-name/system		/system         ext4	defaults		wait
-/dev/block/platform/msm_sdcc.1/by-name/userdata		/data		auto	defaults	 	wait,length=-16384
-/dev/block/platform/msm_sdcc.1/by-name/cache		/cache          auto	defaults		wait
-/dev/block/platform/msm_sdcc.1/by-name/persist		/persist       	ext4	defaults		wait
-
-/dev/block/platform/msm_sdcc.1/by-name/efs		/efs         	ext4	defaults		wait
-/dev/block/platform/msm_sdcc.1/by-name/modem		/firmware-modem	vfat	defaults		wait
-/dev/block/platform/msm_sdcc.1/by-name/apnhlos		/firmware	vfat	defaults		wait
-/dev/block/platform/msm_sdcc.1/by-name/hidden		/preload	ext4	defaults		recoveryonly
-
-/dev/block/mmcblk1p1					/sdcard		auto	defaults		
-
diff --git a/rootdir/etc/fstab.qcom b/rootdir/etc/fstab.qcom
index 2c64545..00518c6 100644
--- a/rootdir/etc/fstab.qcom
+++ b/rootdir/etc/fstab.qcom
@@ -10,6 +10,10 @@
 /dev/block/platform/msm_sdcc.1/by-name/modem		/firmware-modem vfat		ro,shortname=lower,uid=1000,gid=1000,dmask=227,fmask=337,context=u:object_r:firmware_file:s0	wait
 /dev/block/platform/msm_sdcc.1/by-name/apnhlos		/firmware	vfat		ro,shortname=lower,uid=1000,gid=1000,dmask=227,fmask=337,context=u:object_r:firmware_file:s0	wait
 
+/dev/block/platform/msm_sdcc.1/by-name/boot		/boot		emmc		defaults											recoveryonly
+/dev/block/platform/msm_sdcc.1/by-name/recovery		/recovery       emmc		defaults											recoveryonly
+/dev/block/platform/msm_sdcc.1/by-name/hidden		/preload	ext4		defaults											recoveryonly
+
 /devices/msm_sdcc.2/mmc_host/mmc*			auto		auto		defaults											voldmanaged=sdcard1:auto,encryptable=userdata
 /devices/platform/msm_hsusb_host/usb*			auto		auto		defaults											voldmanaged=usb:auto