diff --git a/BoardCommonConfig.mk b/BoardCommonConfig.mk
index 107fe92..2210710 100644
--- a/BoardCommonConfig.mk
+++ b/BoardCommonConfig.mk
@@ -141,7 +141,10 @@ BOARD_USES_MMCUTILS := true
 BOARD_HAS_NO_MISC_PARTITION := true
 BOARD_HAS_NO_SELECT_BUTTON := true
 BOARD_SUPPRESS_EMMC_WIPE := true
+TARGET_RECOVERY_FSTAB := device/samsung/galaxys2-common/rootdir/fstab.smdk4210
+RECOVERY_FSTAB_VERSION := 2
 
+# Device specific headers
 TARGET_SPECIFIC_HEADER_PATH := device/samsung/galaxys2-common/include
 
 # Charging mode
diff --git a/rootdir/fstab.smdk4210 b/rootdir/fstab.smdk4210
index 1d3cd33..a0f807e 100755
--- a/rootdir/fstab.smdk4210
+++ b/rootdir/fstab.smdk4210
@@ -8,8 +8,15 @@
 /dev/block/mmcblk0p7                        /cache                  ext4      noatime,nosuid,nodev,journal_async_commit,errors=panic    wait,check_spo
 /dev/block/mmcblk0p1                        /efs                    ext4      noatime,nosuid,nodev,journal_async_commit,errors=panic    wait,check_spo
 /dev/block/mmcblk0p10                       /data                   ext4      noatime,nosuid,nodev,discard,noauto_da_alloc,journal_async_commit,errors=panic    wait,check_spo,encryptable=/efs/metadata
-/dev/block/mmcblk0p12                       /preload                ext4      ro,nosuid,nodev,noatime                                   wait
+/dev/block/mmcblk0p12                       /preload                ext4      noatime,nosuid,nodev,journal_async_commit                 wait
+
 # vold-managed volumes ("block device" is actually a sysfs devpath)
-/devices/platform/dw_mmc/mmc_host/mmc0/mmc0 /storage/sdcard0        auto      defaults                                                  voldmanaged=sdcard0:11,nonremovable
-/devices/platform/s3c-sdhci.2/mmc_host/mmc1 /storage/sdcard1        auto      defaults                                                  voldmanaged=sdcard1:auto
-/devices/platform/s3c_otghcd/usb            /storage/usbdisk0       auto      defaults                                                  voldmanaged=usbdisk0:auto
+/devices/platform/dw_mmc/mmc_host/mmc0/mmc0 /storage/sdcard0        auto      defaults      voldmanaged=sdcard0:11,nonremovable
+/devices/platform/s3c-sdhci.2/mmc_host/mmc1 /storage/sdcard1        auto      defaults      voldmanaged=sdcard1:auto
+/devices/platform/s3c_otghcd/usb            /storage/usbdisk0       auto      defaults      voldmanaged=usbdisk0:auto
+
+# recovery
+/dev/block/mmcblk0p5                        /boot                   emmc      defaults      recoveryonly
+/dev/block/mmcblk0p6                        /recovery               emmc      defaults      recoveryonly
+/dev/block/mmcblk0p11                       /emmc		            auto      defaults      recoveryonly
+/dev/block/mmcblk1p1                        /sdcard		            auto      defaults      recoveryonly