diff --git a/config/printer.mendel.h b/config/printer.mendel.h
index caa5410..56f3083 100644
--- a/config/printer.mendel.h
+++ b/config/printer.mendel.h
@@ -218,15 +218,6 @@
 */
 #define EECONFIG
 
-/** \def DEBUG
-  Enables /heaps/ of extra output, and some extra M-codes.
-
-  WARNING: this WILL break most host-side talkers that expect particular
-  responses from firmware such as reprap host and replicatorG use with serial
-  terminal or other suitable talker only.
-*/
-//#define DEBUG
-
 /** \def BANG_BANG
   Drops PID loop from heater control, reduces code size significantly
   (1300 bytes!).
diff --git a/config/printer.wolfstrap.h b/config/printer.wolfstrap.h
index cc1729b..3a5bdc7 100644
--- a/config/printer.wolfstrap.h
+++ b/config/printer.wolfstrap.h
@@ -218,15 +218,6 @@
 */
 #define EECONFIG
 
-/** \def DEBUG
-  Enables /heaps/ of extra output, and some extra M-codes.
-
-  WARNING: this WILL break most host-side talkers that expect particular
-  responses from firmware such as reprap host and replicatorG use with serial
-  terminal or other suitable talker only.
-*/
-//#define DEBUG
-
 /** \def BANG_BANG
   Drops PID loop from heater control, reduces code size significantly
   (1300 bytes!).
diff --git a/configtool/miscellaneouspage.py b/configtool/miscellaneouspage.py
index 4ef251b..a32b201 100644
--- a/configtool/miscellaneouspage.py
+++ b/configtool/miscellaneouspage.py
@@ -14,7 +14,6 @@ class MiscellaneousPage(wx.Panel, Page):
 
     self.labels = {'USE_INTERNAL_PULLUPS': "Use Internal Pullups",
                    'EECONFIG': "Enable EEPROM Storage",
-                   'DEBUG': "Turn on Debugging",
                    'BANG_BANG': "Enable",
                    'BANG_BANG_ON': "On PWM Level:",
                    'BANG_BANG_OFF': "Off PWM Level:",
@@ -64,25 +63,21 @@ class MiscellaneousPage(wx.Panel, Page):
     cb = self.addCheckBox(k, self.onCheckBox)
     sz.Add(cb, pos = (2, 1))
 
-    k = 'DEBUG'
+    k = 'USE_WATCHDOG'
     cb = self.addCheckBox(k, self.onCheckBox)
     sz.Add(cb, pos = (3, 1))
 
-    k = 'USE_WATCHDOG'
+    k = 'FAST_PWM'
     cb = self.addCheckBox(k, self.onCheckBox)
     sz.Add(cb, pos = (4, 1))
 
-    k = 'FAST_PWM'
+    k = 'HEATER_SANITY_CHECK'
     cb = self.addCheckBox(k, self.onCheckBox)
     sz.Add(cb, pos = (5, 1))
 
-    k = 'HEATER_SANITY_CHECK'
-    cb = self.addCheckBox(k, self.onCheckBox)
-    sz.Add(cb, pos = (6, 1))
-
     k = 'REPORT_TARGET_TEMPS'
     cb = self.addCheckBox(k, self.onCheckBox)
-    sz.Add(cb, pos = (7, 1))
+    sz.Add(cb, pos = (6, 1))
 
     k = 'REFERENCE'
     ch = self.addChoice(k, self.references,
diff --git a/debug.h b/debug.h
index 863ea8f..f0cd481 100644
--- a/debug.h
+++ b/debug.h
@@ -3,6 +3,19 @@
 
 #include	<stdint.h>
 
+/** \def DEBUG
+  Enable debug output generally and some additional M-codes.
+
+  Individual flags are enabled at runtime using M111 (see gcode_process.c) or
+  by modifying the presets here.
+
+  WARNING: enabling some or all of these is done can produce /heaps/ of extra
+  output. This extra output will break most host-side talkers that expect
+  particular responses from firmware such as RepRap Host or ReplicatorG. Use
+  with serial terminal or other suitable talker only.
+*/
+//#define DEBUG
+
 #ifdef	DEBUG
   #define DEBUG_ECHO       1
   #define DEBUG_INFO       2
diff --git a/testcases/config.h.Profiling b/testcases/config.h.Profiling
index edcbb0e..eb27933 100644
--- a/testcases/config.h.Profiling
+++ b/testcases/config.h.Profiling
@@ -506,14 +506,6 @@ DEFINE_HEATER(bed,      DIO3,  1)
 */
 #define EECONFIG
 
-/** \def DEBUG
-	DEBUG
-		enables /heaps/ of extra output, and some extra M-codes.
-		WARNING: this WILL break most host-side talkers that expect particular responses from firmware such as reprap host and replicatorG
-		use with serial terminal or other suitable talker only.
-*/
-// #define	DEBUG
-
 /** \def BANG_BANG
 BANG_BANG
 drops PID loop from heater control, reduces code size significantly (1300 bytes!)