diff --git a/docs/bucket/versioning/xl-meta-to-json.go b/docs/bucket/versioning/xl-meta-to-json.go
index 4ce63a57a..1d7544d70 100644
--- a/docs/bucket/versioning/xl-meta-to-json.go
+++ b/docs/bucket/versioning/xl-meta-to-json.go
@@ -1,13 +1,19 @@
 package main
 
 import (
+	"bytes"
+	"encoding/json"
+	"fmt"
 	"io"
+	"log"
 	"os"
 
 	"github.com/minio/cli"
 	"github.com/tinylib/msgp/msgp"
 )
 
+var xlHeader = [4]byte{'X', 'L', '2', ' '}
+
 func main() {
 	app := cli.NewApp()
 	app.Copyright = "MinIO, Inc."
@@ -16,21 +22,69 @@ func main() {
 	app.HideHelpCommand = true
 
 	app.Flags = []cli.Flag{
-		cli.StringFlag{
-			Usage: "path to xl.meta file",
-			Name:  "f, file",
+		cli.BoolFlag{
+			Usage: "Print each file as a separate line without formatting",
+			Name:  "ndjson",
 		},
 	}
 
 	app.Action = func(c *cli.Context) error {
-		r, err := os.Open(c.String("file"))
-		if err != nil {
-			return err
+		for _, file := range c.Args() {
+			var r io.Reader
+			switch file {
+			case "-":
+				r = os.Stdin
+			default:
+				f, err := os.Open(file)
+				if err != nil {
+					return err
+				}
+				defer f.Close()
+				r = f
+			}
+
+			// Read header
+			var tmp [4]byte
+			_, err := io.ReadFull(r, tmp[:])
+			if err != nil {
+				return err
+			}
+			if !bytes.Equal(tmp[:], xlHeader[:]) {
+				return fmt.Errorf("xlMeta: unknown XLv2 header, expected %v, got %v", xlHeader[:4], tmp[:4])
+			}
+			// Skip version check for now
+			_, err = io.ReadFull(r, tmp[:])
+			if err != nil {
+				return err
+			}
+
+			var buf bytes.Buffer
+			_, err = msgp.CopyToJSON(&buf, r)
+			if err != nil {
+				return err
+			}
+			if c.Bool("ndjson") {
+				fmt.Println(buf.String())
+				continue
+			}
+			var msi map[string]interface{}
+			dec := json.NewDecoder(&buf)
+			// Use number to preserve integers.
+			dec.UseNumber()
+			err = dec.Decode(&msi)
+			if err != nil {
+				return err
+			}
+			b, err := json.MarshalIndent(msi, "", "  ")
+			if err != nil {
+				return err
+			}
+			fmt.Println(string(b))
 		}
-		r.Seek(8, io.SeekStart)
-		defer r.Close()
-		_, err = msgp.CopyToJSON(os.Stdout, r)
-		return err
+		return nil
+	}
+	err := app.Run(os.Args)
+	if err != nil {
+		log.Fatal(err)
 	}
-	app.Run(os.Args)
 }