cmd/meta4-create/main.go | 33 ++++++++++++++++++++++++---------
 scheme.go                | 22 +++++++++++-----------

diff --git a/cmd/meta4-create/main.go b/cmd/meta4-create/main.go
index d8dded797ec481e4621b94f3d158ac1052faea8785e58142a8b6022c2fd50290..83fc684a4e6aff188930f2db7198022e669ac1cfeeb238230ee11a1a29a05b98 100644
--- a/cmd/meta4-create/main.go
+++ b/cmd/meta4-create/main.go
@@ -20,6 +20,7 @@ import (
 	"bufio"
 	"encoding/xml"
 	"flag"
+	"fmt"
 	"io"
 	"log"
 	"os"
@@ -34,12 +35,24 @@ func main() {
 	fn := flag.String("fn", "", "Filename")
 	mtime := flag.String("mtime", "", "Take that file's mtime as a Published date")
 	desc := flag.String("desc", "", "Description")
-	sigPGP := flag.String("sig-pgp", "", "Path to OpenPGP .asc signature file")
-	sigSSH := flag.String("sig-ssh", "", "Path to OpenSSH .sig signature file")
-	hashes := flag.String("hashes", strings.Join(meta4ra.HashesDefault, ","), "hash-name:command-s")
+	sigPGP := flag.String("sig-pgp", "",
+		"Path to OpenPGP .asc signature file for inclusion")
+	sigSSH := flag.String("sig-ssh", "",
+		"Path to OpenSSH .sig signature file for inclusion")
+	hashes := flag.String("hashes",
+		strings.Join(meta4ra.HashesDefault, ","), "hash-name:command-s")
+	noPublished := flag.Bool("no-published", false,
+		"Do not include Published field")
+	noGenerator := flag.Bool("no-generator", false,
+		"Do not include Generator field")
 	torrent := flag.String("torrent", "", "Torrent URL")
-	log.SetFlags(log.Lshortfile)
+	flag.Usage = func() {
+		fmt.Fprintf(flag.CommandLine.Output(),
+			"Usage: %s [options] [URL ...] < DATA > XXX.meta4\n", os.Args[0])
+		flag.PrintDefaults()
+	}
 	flag.Parse()
+	log.SetFlags(log.Lshortfile)
 	if *fn == "" {
 		log.Fatalln("empty -fn")
 	}
@@ -95,11 +108,13 @@ 			log.Fatalln(err)
 		}
 		published = fi.ModTime()
 	}
-	published = published.UTC().Truncate(time.Second)
-	m := meta4ra.Metalink{
-		Files:     []meta4ra.File{f},
-		Generator: meta4ra.Generator,
-		Published: published,
+	m := meta4ra.Metalink{Files: []meta4ra.File{f}}
+	if !*noPublished {
+		t := published.UTC().Truncate(time.Second)
+		m.Published = &t
+	}
+	if !*noGenerator {
+		m.Generator = meta4ra.Generator
 	}
 	out, err := xml.MarshalIndent(&m, "", "  ")
 	if err != nil {
diff --git a/scheme.go b/scheme.go
index ac8f7ecd14254390b7ed0d81d429d98b56ba181298f5f8d60b280e9b1817eb2a..839942b8b9b779f3945005cdb10a5ae4ecd389faf95ae8f9b031e4645e71e1e1 100644
--- a/scheme.go
+++ b/scheme.go
@@ -21,21 +21,21 @@ 	"time"
 )
 
 type Metalink struct {
-	XMLName   xml.Name  `xml:"urn:ietf:params:xml:ns:metalink metalink"`
-	Files     []File    `xml:"file"`
-	Generator string    `xml:"generator,,omitempty"`
-	Published time.Time `xml:"published,,omitempty"`
+	XMLName   xml.Name   `xml:"urn:ietf:params:xml:ns:metalink metalink"`
+	Files     []File     `xml:"file"`
+	Generator string     `xml:"generator,,omitempty"`
+	Published *time.Time `xml:"published,,omitempty"`
 }
 
 type File struct {
-	XMLName     xml.Name   `xml:"file"`
-	Name        string     `xml:"name,attr"`
-	Description string     `xml:"description,,omitempty"`
-	Hashes      []Hash     `xml:"hash,,omitempty"`
-	MetaURLs    []MetaURL  `xml:"metaurl,,omitempty"`
+	XMLName     xml.Name    `xml:"file"`
+	Name        string      `xml:"name,attr"`
+	Description string      `xml:"description,,omitempty"`
+	Hashes      []Hash      `xml:"hash,,omitempty"`
+	MetaURLs    []MetaURL   `xml:"metaurl,,omitempty"`
 	Signature   []Signature `xml:"signature"`
-	Size        uint64     `xml:"size,,omitempty"`
-	URLs        []URL      `xml:"url,,omitempty"`
+	Size        uint64      `xml:"size,,omitempty"`
+	URLs        []URL       `xml:"url,,omitempty"`
 }
 
 type URL struct {