diff --git a/doc/manpages/qvm-start.rst b/doc/manpages/qvm-start.rst
index f797cdbf..2e0b1311 100644
--- a/doc/manpages/qvm-start.rst
+++ b/doc/manpages/qvm-start.rst
@@ -65,7 +65,7 @@ Options
    
    Do not fail if the qube is already runnning
 
-.. option:: --no-start-guid
+.. option:: --no-start-guid, --no-guid
 
    Do not start GUI daemon.
 
diff --git a/qubes/tools/qvm_start.py b/qubes/tools/qvm_start.py
index ab3106f3..5e8bfd17 100644
--- a/qubes/tools/qvm_start.py
+++ b/qubes/tools/qvm_start.py
@@ -88,7 +88,11 @@ parser.add_argument('--preparing-dvm',
 
 parser.add_argument('--no-start-guid',
     action='store_false', dest='start_guid', default=True,
-    help='do not start the gui daemon (ignored)')
+    help='do not start the gui daemon')
+
+parser.add_argument('--no-guid',
+    action='store_false', dest='start_guid',
+    help='same as --no-start-guid')
 
 parser.add_argument('--skip-if-running',
     action='store_true', default=False,