diff --git a/reactos/ReactOS.rbuild b/reactos/ReactOS.rbuild
index aafabe834ab..d5ab7c4b995 100644
--- a/reactos/ReactOS.rbuild
+++ b/reactos/ReactOS.rbuild
@@ -24,11 +24,14 @@
     <define name="KDBG" value="1" />
     <property name="DBG_OR_KDBG" value="true" />
   </if>
-  <compilerflag>-Os</compilerflag>
-  <compilerflag>-Wno-strict-aliasing</compilerflag>
-  <compilerflag>-ftracer</compilerflag>
-  <compilerflag>-momit-leaf-frame-pointer</compilerflag>
-  <compilerflag>-mpreferred-stack-boundary=2</compilerflag>
+  
+  <if property="GDB" value="0">
+    <compilerflag>-Os</compilerflag>
+    <compilerflag>-Wno-strict-aliasing</compilerflag>
+    <compilerflag>-ftracer</compilerflag>
+    <compilerflag>-momit-leaf-frame-pointer</compilerflag>
+    <compilerflag>-mpreferred-stack-boundary=2</compilerflag>
+  </if>
   <compilerflag>-Wpointer-arith</compilerflag>
 
   <include>.</include>
diff --git a/reactos/config.template.rbuild b/reactos/config.template.rbuild
index a47e717af6b..1c0b026a7b3 100644
--- a/reactos/config.template.rbuild
+++ b/reactos/config.template.rbuild
@@ -53,4 +53,11 @@
 -->
 <property name="DBG" value="1" />
 
+
+<!--
+  Whether to compile for debugging with GDB. If you don't use GDB, don't
+  enable this.
+-->
+<property name="GDB" value="0" />
+
 </rbuild>