diff --git a/xl-v1.go b/xl-v1.go
index 3285c4c75..1247b7eda 100644
--- a/xl-v1.go
+++ b/xl-v1.go
@@ -20,6 +20,7 @@ import (
 	"fmt"
 	"os"
 	slashpath "path"
+	"sort"
 	"strings"
 	"sync"
 
@@ -554,6 +555,8 @@ func (xl XL) listFiles(disk StorageAPI, volume, prefix, marker string, recursive
 			break
 		}
 	}
+	// Sort to make sure we sort entries back properly.
+	sort.Sort(byFileInfoName(filesInfo))
 	return filesInfo, eof, nil
 }