diff --git a/unix/vncserver b/unix/vncserver
index d63a518..f2c5a69 100755
--- a/unix/vncserver
+++ b/unix/vncserver
@@ -732,6 +732,10 @@ sub ProcessCliOptions {
     $fontPath = $opt{'-fp'};
     $fpArgSpecified = 1;
   }
+  if ($opt{'-debug'}) {
+    delete $opt{'-debug'};
+    $opt{'-log'} = '*:stderr:100';
+  }
 }
 
 sub CreateDotVncDir {
@@ -1102,7 +1106,7 @@ sub DefineFilePathsAndStuff {
 }
 
 sub ParseAndProcessCliOptions {
-  my @supportedOptions = ("-geometry",1,"-depth",1,"-pixelformat",1,"-name",1,"-kill",1,"-help",0,"-h",0,"--help",0,"-fp",1,"-list",0,"-fg",0,"-autokill",0,"-noxstartup",0,"-xstartup",1,"-select-de",OPTIONAL_ARG_VALUE, "-interface", REQUIRED_ARG_VALUE);
+  my @supportedOptions = ("-geometry",1,"-depth",1,"-pixelformat",1,"-name",1,"-kill",1,"-help",0,"-h",0,"--help",0,"-fp",1,"-list",0,"-fg",0,"-autokill",0,"-noxstartup",0,"-xstartup",1,"-select-de",OPTIONAL_ARG_VALUE, "-interface", REQUIRED_ARG_VALUE, '-debug', NO_ARG_VALUE);
   &ParseOptionsAndRemoveMatchesFromARGV(@supportedOptions);
   &ProcessCliOptions();
   &CheckGeometryAndDepthAreSensible();