diff --git a/cmd/goose/main.go b/cmd/goose/main.go
index 1560552..73c121a 100644
--- a/cmd/goose/main.go
+++ b/cmd/goose/main.go
@@ -25,7 +25,7 @@ func main() {
 	flags.Parse(os.Args[1:])
 
 	args := flags.Args()
-	if len(args) != 3 {
+	if len(args) < 3 {
 		flags.Usage()
 		return
 	}
diff --git a/migrate.go b/migrate.go
index c0bb42a..a214a0e 100644
--- a/migrate.go
+++ b/migrate.go
@@ -393,6 +393,9 @@ func CreateMigration(name, migrationType, dir string, t time.Time) (path string,
 
 	fpath := filepath.Join(dir, filename)
 	tmpl := sqlMigrationTemplate
+	if migrationType == "go" {
+		tmpl = goSqlMigrationTemplate
+	}
 
 	path, err = writeTemplateToFile(fpath, tmpl, timestamp)
 
@@ -422,3 +425,24 @@ var sqlMigrationTemplate = template.Must(template.New("goose.sql-migration").Par
 -- SQL section 'Down' is executed when this migration is rolled back
 
 `))
+var goSqlMigrationTemplate = template.Must(template.New("goose.go-migration").Parse(`
+package migration
+
+import (
+    "database/sql"
+
+    "github.com/pressly/goose"
+)
+
+func init() {
+    goose.AddMigration(Up_{{.}}, Down_{{.}})
+}
+
+func Up_{{.}}(tx *sql.Tx) error {
+    return nil
+}
+
+func Down_{{.}}(tx *sql.Tx) error {
+    return nil
+}
+`))