diff --git a/src/cfg.c b/src/cfg.c
index db4d86dc..eba0de41 100644
--- a/src/cfg.c
+++ b/src/cfg.c
@@ -1250,7 +1250,7 @@ int kvz_config_parse(kvz_config *cfg, const char *name, const char *value)
   else if (OPT("fast-residual-cost"))
     cfg->fast_residual_cost_limit = atoi(value);
 	else if (OPT("vaq")) {
-		cfg->vaq = true;
+		cfg->vaq = (bool)atobool(value);
 	}
   else if (OPT("max-merge")) {
     int max_merge = atoi(value);
diff --git a/src/cli.c b/src/cli.c
index ba41a81b..f748f6e2 100644
--- a/src/cli.c
+++ b/src/cli.c
@@ -134,6 +134,7 @@ static const struct option long_options[] = {
   { "open-gop",                 no_argument, NULL, 0 },
   { "no-open-gop",              no_argument, NULL, 0 },
 	{	"vaq",											no_argument, NULL, 0 },	
+  { "no-vaq",                   no_argument, NULL, 0 },
   { "scaling-list",       required_argument, NULL, 0 },
   { "max-merge",          required_argument, NULL, 0 },
   { "early-skip",               no_argument, NULL, 0 },