diff --git a/Android.mk b/Android.mk
index 177ccbd..fbb7184 100644
--- a/Android.mk
+++ b/Android.mk
@@ -26,7 +26,7 @@ LOCAL_MODULE := recovery
 
 LOCAL_FORCE_STATIC_EXECUTABLE := true
 
-RECOVERY_VERSION := ClockworkMod Recovery v2.0.0.2
+RECOVERY_VERSION := ClockworkMod Recovery v2.0.0.4
 LOCAL_CFLAGS := -DRECOVERY_VERSION="$(RECOVERY_VERSION)"
 RECOVERY_API_VERSION := 2
 LOCAL_CFLAGS += -DRECOVERY_API_VERSION=$(RECOVERY_API_VERSION)
diff --git a/roots.c b/roots.c
index b2df224..4450c1e 100644
--- a/roots.c
+++ b/roots.c
@@ -37,11 +37,11 @@ static const char g_raw[] = "@\0g_raw";
 static const char g_package_file[] = "@\0g_package_file";
 
 #ifndef SDCARD_DEVICE_PRIMARY
-#define SDCARD_DEVICE_PRIMARY "/dev/block/mmcblk0p1"
+#define SDCARD_DEVICE_PRIMARY "/dev/block/mmcblk0"
 #endif
 
 #ifndef SDCARD_DEVICE_SECONDARY
-#define SDCARD_DEVICE_SECONDARY "/dev/block/mmcblk0p2"
+#define SDCARD_DEVICE_SECONDARY "/dev/block/mmcblk0p1"
 #endif
 
 #ifndef SDEXT_DEVICE