diff --git a/torrent/file.go b/torrent/file.go
index e8ac10e..d06f177 100644
--- a/torrent/file.go
+++ b/torrent/file.go
@@ -14,16 +14,16 @@ type File struct {
 	AnnounceList []string `bencode:"announce-list"`
 
 	// Epoch of the creation of this torrent
-	CreationDate int64 `bencode:"creation date"`
+	CreationDate int64 `bencode:"creation date,omitempty"`
 
 	// Dictionary about this torrent, including files to be tracked
-	Info InfoSection `bencode:"info"`
+	Info InfoSection `bencode:"info,omitempty"`
 
 	// free-form textual comments of the author
-	Comment string `bencode:"comment"`
+	Comment string `bencode:"comment,omitempty"`
 
 	// name and version of the program used to create the .torrent
-	CreatedBy string `bencode:"created by"`
+	CreatedBy string `bencode:"created by,omitempty"`
 
 	// string encoding used to generate the `pieces` and `info` fields
 	Encoding string `bencode:"encoding"`
@@ -35,7 +35,7 @@ func (f File) CreationDateTime() time.Time {
 
 type InfoSection struct {
 	// suggested file/directory name where the file(s) are to be saved
-	Name string `bencode:"name"`
+	Name string `bencode:"name,omitempty"`
 
 	// hash list of joined SHA1 sums (160-bit length)
 	Pieces string `bencode:"pieces"`
@@ -44,10 +44,10 @@ type InfoSection struct {
 	PieceLength int64 `bencode:"piece length"`
 
 	// size of the file in bytes (only if this torrent is for a single file)
-	Length int64 `bencode:"length"`
+	Length int64 `bencode:"length,omitempty"`
 
 	// 32-char hexadecimal string corresponding to the MD5 sum of the file (only if this torrent is for a single file)
-	MD5 string `bencode:"md5sum"`
+	MD5 string `bencode:"md5sum,omitempty"`
 
 	// list of information about the files
 	Files []FileInfo `bencode:"files"`
@@ -69,7 +69,7 @@ type FileInfo struct {
 	Path []string `bencode:"path"`
 
 	// 32-char hexadecimal string corresponding to the MD5 sum of the file (only if this torrent is for a single file)
-	MD5 string `bencode:"md5sum"`
+	MD5 string `bencode:"md5sum,omitempty"`
 }
 
 type torrentError struct {