diff --git a/cmd/md2pq/md2pq.go b/cmd/md2pq/md2pq.go
index adc98b1..7b95d39 100644
--- a/cmd/md2pq/md2pq.go
+++ b/cmd/md2pq/md2pq.go
@@ -218,9 +218,24 @@ func main() {
 	}
 
 	glog.Infoln("Using uid", uid, "for", *username)
-	if *maildir == "" {
-		if err := LoadReader(db, uid, os.Stdin); err != nil {
-			glog.Fatal(err)
+	if *maildir == "" || flag.NArg() > 0 {
+		if flag.NArg() == 0 {
+			if err := LoadReader(db, uid, os.Stdin); err != nil {
+				glog.Errorln(err)
+			}
+			return
+		}
+
+		for _, fn := range flag.Args() {
+			r, err := os.Open(fn)
+			if err != nil {
+				glog.Error(err)
+				continue
+			}
+			if err := LoadReader(db, uid, r); err != nil {
+				glog.Errorln(fn, err)
+			}
+			r.Close()
 		}
 		return
 	}