diff --git a/code/espurna/config/arduino.h b/code/espurna/config/arduino.h
index 0ed75484..5949eed6 100644
--- a/code/espurna/config/arduino.h
+++ b/code/espurna/config/arduino.h
@@ -3,21 +3,6 @@
 // Uncomment the appropiate line(s) to build from the Arduino IDE
 //--------------------------------------------------------------------------------
 
-//--------------------------------------------------------------------------------
-// General
-//--------------------------------------------------------------------------------
-
-#ifndef DEBUG_PORT
-#define DEBUG_PORT              Serial
-#endif
-
-// Uncomment and configure these lines to enable remote debug via udpDebug
-// To receive the message son the destination computer use nc:
-// nc -ul 8111
-
-//#define DEBUG_UDP_IP            IPAddress(192, 168, 1, 100)
-//#define DEBUG_UDP_PORT          8111
-
 //--------------------------------------------------------------------------------
 // Hardware
 //--------------------------------------------------------------------------------
diff --git a/code/espurna/config/general.h b/code/espurna/config/general.h
index bffd22f0..c19bc6e5 100644
--- a/code/espurna/config/general.h
+++ b/code/espurna/config/general.h
@@ -8,6 +8,21 @@
 #define HEARTBEAT_INTERVAL      300000
 #define UPTIME_OVERFLOW         4294967295
 
+//--------------------------------------------------------------------------------
+// DEBUG
+//--------------------------------------------------------------------------------
+
+#ifndef DEBUG_PORT
+#define DEBUG_PORT              Serial
+#endif
+
+// Uncomment and configure these lines to enable remote debug via udpDebug
+// To receive the message son the destination computer use nc:
+// nc -ul 8111
+
+//#define DEBUG_UDP_IP            IPAddress(192, 168, 1, 100)
+//#define DEBUG_UDP_PORT          8111
+
 //--------------------------------------------------------------------------------
 // EEPROM
 //--------------------------------------------------------------------------------