diff --git a/fs-v1.go b/fs-v1.go
index e66ad74ce..59d26fe87 100644
--- a/fs-v1.go
+++ b/fs-v1.go
@@ -199,9 +199,14 @@ func (fs fsObjects) DeleteBucket(bucket string) error {
 	if !IsValidBucketName(bucket) {
 		return BucketNameInvalid{Bucket: bucket}
 	}
+	// Attempt to delete regular bucket.
 	if err := fs.storage.DeleteVol(bucket); err != nil {
 		return toObjectErr(err, bucket)
 	}
+	// Cleanup all the previously incomplete multiparts.
+	if err := cleanupDir(fs.storage, path.Join(minioMetaBucket, mpartMetaPrefix), bucket); err != nil {
+		return toObjectErr(err, bucket)
+	}
 	return nil
 }
 
diff --git a/object-common.go b/object-common.go
index 849f9395c..7070abf7c 100644
--- a/object-common.go
+++ b/object-common.go
@@ -171,22 +171,22 @@ func cleanupDir(storage StorageAPI, volume, dirPath string) error {
 	// Function to delete entries recursively.
 	delFunc = func(entryPath string) error {
 		if !strings.HasSuffix(entryPath, slashSeparator) {
-			// No trailing "/" means that this is a file which can be deleted.
+			// Delete the file entry.
 			return storage.DeleteFile(volume, entryPath)
 		}
+
 		// If it's a directory, list and call delFunc() for each entry.
 		entries, err := storage.ListDir(volume, entryPath)
-		if err != nil {
-			if err == errFileNotFound {
-				// if dirPath prefix never existed.
-				return nil
-			}
+		// If entryPath prefix never existed, safe to ignore.
+		if err == errFileNotFound {
+			return nil
+		} else if err != nil { // For any other errors fail.
 			return err
-		}
-		for _, entry := range entries {
-			err = delFunc(pathJoin(entryPath, entry))
+		} // else on success..
 
-			if err != nil {
+		// Recurse and delete all other entries.
+		for _, entry := range entries {
+			if err = delFunc(pathJoin(entryPath, entry)); err != nil {
 				return err
 			}
 		}
diff --git a/xl-v1-bucket.go b/xl-v1-bucket.go
index ae518c5cc..084003fc9 100644
--- a/xl-v1-bucket.go
+++ b/xl-v1-bucket.go
@@ -17,6 +17,7 @@
 package main
 
 import (
+	"path"
 	"sort"
 	"sync"
 )
@@ -238,7 +239,14 @@ func (xl xlObjects) DeleteBucket(bucket string) error {
 		// Delete volume inside a go-routine.
 		go func(index int, disk StorageAPI) {
 			defer wg.Done()
+			// Attempt to delete bucket.
 			err := disk.DeleteVol(bucket)
+			if err != nil {
+				dErrs[index] = err
+				return
+			}
+			// Cleanup all the previously incomplete multiparts.
+			err = cleanupDir(disk, path.Join(minioMetaBucket, mpartMetaPrefix), bucket)
 			if err != nil {
 				dErrs[index] = err
 			}
@@ -248,8 +256,7 @@ func (xl xlObjects) DeleteBucket(bucket string) error {
 	// Wait for all the delete vols to finish.
 	wg.Wait()
 
-	// Count the errors for known errors, return quickly if we found
-	// an unknown error.
+	// Count the errors for known errors, return quickly if we found an unknown error.
 	for _, err := range dErrs {
 		if err != nil {
 			if isErrIgnored(err, objMetadataOpIgnoredErrs) {