diff --git a/BoardConfig.mk b/BoardConfig.mk
index 62445bc..16c4fae 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -108,6 +108,8 @@ BOARD_RECOVERY_HANDLES_MOUNT := true
 BOARD_USES_BML_OVER_MTD := true
 BOARD_CUSTOM_RECOVERY_KEYMAPPING:= ../../device/samsung/epicmtd/recovery_ui.c
 BOARD_CUSTOM_BOOTIMG_MK := device/samsung/epicmtd/shbootimg.mk
+TARGET_RECOVERY_FSTAB := device/samsung/epicmtd/fstab.victory
+RECOVERY_FSTAB_VERSION := 2
 TARGET_OTA_ASSERT_DEVICE := epic,epicmtd,SPH-D700
 
 # RIL
diff --git a/epicmtd.mk b/epicmtd.mk
index 2108f25..465f64b 100755
--- a/epicmtd.mk
+++ b/epicmtd.mk
@@ -25,12 +25,12 @@ DEVICE_PACKAGE_OVERLAYS := device/samsung/epicmtd/overlay
 # These are the hardware-specific configuration files
 PRODUCT_COPY_FILES := \
     device/samsung/epicmtd/prebuilt/etc/asound.conf:system/etc/asound.conf \
-    device/samsung/epicmtd/prebuilt/etc/vold.fstab:system/etc/vold.fstab \
     device/samsung/epicmtd/prebuilt/etc/media_codecs.xml:system/etc/media_codecs.xml \
     device/samsung/epicmtd/prebuilt/etc/egl.cfg:system/lib/egl/egl.cfg
 
 # Init files
 PRODUCT_COPY_FILES += \
+  device/samsung/epicmtd/fstab.victory:root/fstab.victory \
   device/samsung/epicmtd/ueventd.victory.rc:root/ueventd.victory.rc \
   device/samsung/epicmtd/lpm.rc:root/lpm.rc \
   device/samsung/epicmtd/init.victory.rc:root/init.victory.rc \
diff --git a/fstab.victory b/fstab.victory
new file mode 100644
index 0000000..b956eb5
--- /dev/null
+++ b/fstab.victory
@@ -0,0 +1,11 @@
+# Android fstab file.
+#<src>                                                  <mnt_point>         <type>    <mnt_flags and options>                       <fs_mgr_flags>
+# The filesystem that contains the filesystem checker binary (typically /system) cannot
+# specify MF_CHECK, and must come before any filesystems that do specify MF_CHECK
+recovery                    /recovery           mtd         defaults                                            recoveryonly
+boot                        /boot               mtd         defaults                                            recoveryonly
+system                      /system             yaffs2      defaults                                            recoveryonly
+userdata                    /data               yaffs2      defaults                                            recoveryonly
+cache                       /cache              yaffs2      defaults                                            recoveryonly
+
+/devices/platform/s3c-sdhci.2/mmc_host/mmc2             /storage/sdcard0    auto      defaults                                      voldmanaged=sdcard0:auto
diff --git a/prebuilt/etc/vold.fstab b/prebuilt/etc/vold.fstab
deleted file mode 100644
index d88a7ed..0000000
--- a/prebuilt/etc/vold.fstab
+++ /dev/null
@@ -1,16 +0,0 @@
-## Vold 2.0 Generic fstab
-## - San Mehat (san@android.com)
-## 
-
-#######################
-## Regular device mount
-##
-## Format: dev_mount <label> <mount_point> <part> <sysfs_path1...> 
-## label        - Label for the volume
-## mount_point  - Where the volume will be mounted
-## part         - Partition # (1 based), or 'auto' for first usable partition.
-## <sysfs_path> - List of sysfs paths to source devices, must start with '/' character
-## flags        - (optional) Comma separated list of flags, must not contain '/' character
-######################
-
-dev_mount sdcard /storage/sdcard0 auto /devices/platform/s3c-sdhci.2/mmc_host/mmc2
diff --git a/recovery.fstab b/recovery.fstab
deleted file mode 100755
index 6a1b0a7..0000000
--- a/recovery.fstab
+++ /dev/null
@@ -1,10 +0,0 @@
-# mount point	fstype		device
-
-/sdcard		vfat		/dev/block/mmcblk0p1
-/system		yaffs2		system
-/cache		yaffs2		cache
-/data		yaffs2		userdata
-
-/boot		mtd		boot
-/recovery	mtd		recovery
-