diff --git a/source2/Debug/Cosmos.Debug.VSDebugEngine/AD7.Impl/AD7Process.cs b/source2/Debug/Cosmos.Debug.VSDebugEngine/AD7.Impl/AD7Process.cs
index 700d54d3c..5fd9880fe 100644
--- a/source2/Debug/Cosmos.Debug.VSDebugEngine/AD7.Impl/AD7Process.cs
+++ b/source2/Debug/Cosmos.Debug.VSDebugEngine/AD7.Impl/AD7Process.cs
@@ -50,15 +50,15 @@ namespace Cosmos.Debug.VSDebugEngine
             Boolean.TryParse(mDebugInfo["QemuEnableGDB"], out xGDBDebugStub);
 
 #if VM_QEMU
-#if DEBUG_CONNECTOR_TCP_SERVER
-            var xDebugConnectorStr = "-serial tcp:127.0.0.1:4444";
-#endif
-#if DEBUG_CONNECTOR_PIPE_CLIENT
-            var xDebugConnectorStr = @"-serial pipe:CosmosDebug";
-#endif
-#if DEBUG_CONNECTOR_PIPE_SERVER
-            var xDebugConnectorStr = @"-serial pipe:CosmosDebug";
-#endif
+    #if DEBUG_CONNECTOR_TCP_SERVER
+                var xDebugConnectorStr = "-serial tcp:127.0.0.1:4444";
+    #endif
+    #if DEBUG_CONNECTOR_PIPE_CLIENT
+                var xDebugConnectorStr = @"-serial pipe:CosmosDebug";
+    #endif
+    #if DEBUG_CONNECTOR_PIPE_SERVER
+                var xDebugConnectorStr = @"-serial pipe:CosmosDebug";
+    #endif
 
             // Start QEMU
             // QEMU Command Line docs: http://wiki.qemu.org/download/qemu-doc.html#sec_005finvocation
@@ -72,6 +72,13 @@ namespace Cosmos.Debug.VSDebugEngine
                 + " -boot d" // Boot from the CDRom
                 + " " + xDebugConnectorStr;
 
+            if (xGDBDebugStub)
+            {
+                mProcessStartInfo.Arguments += " -s -S";
+            }
+
+
+
 #endif
 #if VM_VMWare
             mProcessStartInfo.Arguments = @"true C:\source\Cosmos\Build\VMWare\Workstation\Cosmos.vmx";