diff --git a/commands/convert.go b/commands/convert.go
index 9d79a53ad..c9482bea4 100644
--- a/commands/convert.go
+++ b/commands/convert.go
@@ -117,7 +117,7 @@ func convertContents(mark rune) (err error) {
 		}
 
 		// better handling of dates in formats that don't have support for them
-		if mark == parser.FormatToLeadRune("json") || mark == parser.FormatToLeadRune("yaml") {
+		if mark == parser.FormatToLeadRune("json") || mark == parser.FormatToLeadRune("yaml") || mark == parser.FormatToLeadRune("toml") {
 			newmetadata := cast.ToStringMap(metadata)
 			for k, v := range newmetadata {
 				switch vv := v.(type) {
diff --git a/create/content.go b/create/content.go
index 01a1c9aac..aea84c517 100644
--- a/create/content.go
+++ b/create/content.go
@@ -90,7 +90,7 @@ func NewContent(kind, name string) (err error) {
 		return err
 	}
 
-	if x := viper.GetString("MetaDataFormat"); x == "json" || x == "yaml" {
+	if x := viper.GetString("MetaDataFormat"); x == "json" || x == "yaml" || x == "toml" {
 		newmetadata["date"] = time.Now().Format(time.RFC3339)
 	}