diff --git a/cobra/cmd/add.go b/cobra/cmd/add.go
index 45f00bb..c97ce84 100644
--- a/cobra/cmd/add.go
+++ b/cobra/cmd/add.go
@@ -121,7 +121,8 @@ func validateCmdName(source string) string {
 
 func createCmdFile(license License, path, cmdName string) {
 	template := `{{comment .copyright}}
-{{comment .license}}
+{{if .license}}//
+{{comment .license}}{{end}}
 
 package {{.cmdPackage}}
 
diff --git a/cobra/cmd/init.go b/cobra/cmd/init.go
index 149aabe..2338b4f 100644
--- a/cobra/cmd/init.go
+++ b/cobra/cmd/init.go
@@ -107,7 +107,8 @@ func createLicenseFile(license License, path string) {
 
 func createMainFile(project *Project) {
 	mainTemplate := `{{ comment .copyright }}
-{{if .license}}{{ comment .license }}{{end}}
+{{if .license}}//
+{{ comment .license }}{{end}}
 
 package main
 
@@ -135,7 +136,8 @@ func main() {
 
 func createRootCmdFile(project *Project) {
 	template := `{{comment .copyright}}
-{{if .license}}{{comment .license}}{{end}}
+{{if .license}}//
+{{comment .license}}{{end}}
 
 package cmd
 
diff --git a/cobra/cmd/testdata/main.go.golden b/cobra/cmd/testdata/main.go.golden
index 69ecbd4..cdbe38d 100644
--- a/cobra/cmd/testdata/main.go.golden
+++ b/cobra/cmd/testdata/main.go.golden
@@ -1,4 +1,5 @@
 // Copyright © 2017 NAME HERE <EMAIL ADDRESS>
+//
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
diff --git a/cobra/cmd/testdata/root.go.golden b/cobra/cmd/testdata/root.go.golden
index ecc8760..8eeeae8 100644
--- a/cobra/cmd/testdata/root.go.golden
+++ b/cobra/cmd/testdata/root.go.golden
@@ -1,4 +1,5 @@
 // Copyright © 2017 NAME HERE <EMAIL ADDRESS>
+//
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
diff --git a/cobra/cmd/testdata/test.go.golden b/cobra/cmd/testdata/test.go.golden
index c8319d1..5840568 100644
--- a/cobra/cmd/testdata/test.go.golden
+++ b/cobra/cmd/testdata/test.go.golden
@@ -1,4 +1,5 @@
 // Copyright © 2017 NAME HERE <EMAIL ADDRESS>
+//
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at