diff --git a/TODO.txt b/TODO.txt
deleted file mode 100644
index 944dc80e3..000000000
--- a/TODO.txt
+++ /dev/null
@@ -1 +0,0 @@
-- var-file doesn't work
diff --git a/command/meta.go b/command/meta.go
index e62577df9..0dc721bd1 100644
--- a/command/meta.go
+++ b/command/meta.go
@@ -32,7 +32,6 @@ type Meta struct {
 	flagBuildExcept []string
 	flagBuildOnly   []string
 	flagVars        map[string]string
-	flagVarFiles    []string
 }
 
 // Core returns the core for the given template given the configured
@@ -122,7 +121,7 @@ func (m *Meta) FlagSet(n string, fs FlagSetFlags) *flag.FlagSet {
 	// FlagSetVars tells us what variables to use
 	if fs&FlagSetVars != 0 {
 		f.Var((*kvflag.Flag)(&m.flagVars), "var", "")
-		f.Var((*sliceflag.StringFlag)(&m.flagVarFiles), "var-file", "")
+		f.Var((*kvflag.FlagJSON)(&m.flagVars), "var-file", "")
 	}
 
 	// Create an io.Writer that writes to our Ui properly for errors.