diff --git a/CMakeLists.txt b/CMakeLists.txt
index 15c4126d64..eb5d2edfe3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -50,7 +50,7 @@ option(ENCODE_FRAMEDUMPS "Encode framedumps in AVI format" ON)
 
 option(ENABLE_GPROF "Enable gprof profiling (must be using Debug build)" OFF)
 option(FASTLOG "Enable all logs" OFF)
-option(GDBSTUB "Enable gdb stub for remote debugging." OFF)
+option(GDBSTUB "Enable gdb stub for remote debugging." ON)
 option(OPROFILING "Enable profiling" OFF)
 
 # TODO: Add DSPSpy
diff --git a/Source/Core/Core/PowerPC/GDBStub.cpp b/Source/Core/Core/PowerPC/GDBStub.cpp
index fe2476584c..d2b635aae7 100644
--- a/Source/Core/Core/PowerPC/GDBStub.cpp
+++ b/Source/Core/Core/PowerPC/GDBStub.cpp
@@ -240,7 +240,7 @@ static void gdb_read_command()
   cmd_len = 0;
   memset(cmd_bfr, 0, sizeof cmd_bfr);
 
-  const u8 c = gdb_read_byte();
+  u8 c = gdb_read_byte();
   if (c == '+')
   {
     // ignore ack