diff --git a/common.mk b/common.mk
index 848bfe8..08a9952 100644
--- a/common.mk
+++ b/common.mk
@@ -30,10 +30,6 @@ PRODUCT_COPY_FILES += \
     $(COMMON_PATH)/configs/tinyalsa-audio.xml:system/etc/tinyalsa-audio.xml \
     $(COMMON_PATH)/configs/audio_policy.conf:system/etc/audio_policy.conf
 
-# Vold and Storage
-PRODUCT_COPY_FILES += \
-    $(COMMON_PATH)/configs/vold.fstab:system/etc/vold.fstab
-
 # Bluetooth configuration files
 PRODUCT_COPY_FILES += \
     system/bluetooth/data/main.le.conf:system/etc/bluetooth/main.conf
diff --git a/configs/vold.fstab b/configs/vold.fstab
deleted file mode 100644
index bc12264..0000000
--- a/configs/vold.fstab
+++ /dev/null
@@ -1,22 +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
-######################
-
-# internal sdcard
-dev_mount sdcard0 /storage/sdcard0 11 /devices/platform/dw_mmc/mmc_host/mmc0/mmc0 nonremovable,encryptable
-
-# external sdcard
-dev_mount sdcard1 /storage/sdcard1 auto /devices/platform/s3c-sdhci.2/mmc_host/mmc1
-
-# USB storage device
-dev_mount usbdisk0 /storage/usbdisk0 auto /devices/platform/s3c_otghcd/usb
diff --git a/rootdir/fstab.smdk4210 b/rootdir/fstab.smdk4210
index 13236af..1d3cd33 100755
--- a/rootdir/fstab.smdk4210
+++ b/rootdir/fstab.smdk4210
@@ -1,11 +1,15 @@
 # Android fstab file.
-#<src>                  <mnt_point>         <type>    <mnt_flags and options>                               <fs_mgr_flags>
+#<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
 # data partition must be located at the bottom for supporting device encryption
 
-/dev/block/mmcblk0p9    /system             ext4      ro,noatime    wait
-/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/mmcblk0p9                        /system                 ext4      ro,noatime                                                wait
+/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
+# 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