diff --git a/arch/arm/mach-msm/nand_partitions.c b/arch/arm/mach-msm/nand_partit
index ba77fdd..41ba161 100644
--- a/arch/arm/mach-msm/nand_partitions.c
+++ b/arch/arm/mach-msm/nand_partitions.c
@@ -77,6 +77,13 @@ static int __init parse_tag_msm_partition(const struct tag *t
                ptn->name = name;
                ptn->offset = entry->offset;
                ptn->size = entry->size;
+               if (!strcmp(name, "system"))
+               {
+                       ptn->size += 640;
+                       ptn->offset -= 640;
+               }
+               else if (!strcmp(name, "userdata"))
+                       ptn->size -= 640;

                printk(KERN_INFO "Partition (from atag) %s "
                                "-- Offset:%llx Size:%llx\n",