diff --git a/aksetup_helper.py b/aksetup_helper.py
index bce155db18a1fd9a0ae2a8c7e829cf693b33f51a..afc6cb951c76e724270d2544224076558062ea8d 100644
--- a/aksetup_helper.py
+++ b/aksetup_helper.py
@@ -452,13 +452,16 @@ class Switch(Option):
         if default is None:
             default = self.default
 
+        option_name = self.as_option()
+
         if default:
+            option_name = "no-" + option_name
             action = "store_false"
         else:
             action = "store_true"
 
         parser.add_option(
-            "--" + self.as_option(),
+            "--" + option_name,
             dest=self.name,
             help=self.get_help(default),
             default=default,