diff --git a/Android.mk b/Android.mk
index 0fb6fd0..177ccbd 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.0
+RECOVERY_VERSION := ClockworkMod Recovery v2.0.0.2
 LOCAL_CFLAGS := -DRECOVERY_VERSION="$(RECOVERY_VERSION)"
 RECOVERY_API_VERSION := 2
 LOCAL_CFLAGS += -DRECOVERY_API_VERSION=$(RECOVERY_API_VERSION)
diff --git a/commands.c b/commands.c
index 5024c08..242fd2d 100644
--- a/commands.c
+++ b/commands.c
@@ -145,7 +145,15 @@ cmd_format(const char *name, void *cookie, int argc, const char *argv[],
         LOGE("Can't format %s\n", root);
         return 1;
     }
-
+#ifdef HAS_DATADATA
+    if (0 == strcmp(root, "DATA:")) {
+        ret = format_root_device("DATADATA:");
+        if (ret != 0) {
+            LOGE("Can't format %s\n", root);
+            return 1;
+        }
+    }
+#endif
     return 0;
 }
 
diff --git a/recovery.c b/recovery.c
index 442d2b6..4a513b4 100644
--- a/recovery.c
+++ b/recovery.c
@@ -392,6 +392,9 @@ wipe_data(int confirm) {
     ui_print("\n-- Wiping data...\n");
     device_wipe_data();
     erase_root("DATA:");
+#ifdef HAS_DATADATA
+    erase_root("DATADATA:");
+#endif
     erase_root("CACHE:");
     erase_root("SDEXT:");
     ui_print("Data wipe complete.\n");