diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index 5860146e..07a5a875 100755
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -80,6 +80,20 @@
 //#define KNUTWURST_MEGA_X
 //#define KNUTWURST_MEGA_P
 
+/*
+ * If you own the first generation i3 Mega
+ * with only one Z endstop, you need to activate
+ * KNUTWURST_MEGA and also this to disable
+ * the left endstop and switch the Z Motors.
+ * 
+ * If the option is disabled, two Z endstops
+ * are used by default.
+ * 
+ * PLEASE READ THE WARNING ABOVE!
+ * 
+ */
+#define KNUTWURST_ONE_Z_ENDSTOP
+
 /*
  * If you have defined the MEGA_X or if
  * you have the "new" Mega S with the blue/yellow
@@ -750,7 +764,10 @@
 #define USE_XMIN_PLUG
 #define USE_YMIN_PLUG
 #define USE_ZMIN_PLUG
-#define USE_XMAX_PLUG
+
+#if DISABLED(KNUTWURST_ONE_Z_ENDSTOP)
+  #define USE_XMAX_PLUG
+#endif
 //#define USE_YMAX_PLUG
 //#define USE_ZMAX_PLUG
 
diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index 1a42ece5..6a0e0bf0 100755
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -537,19 +537,21 @@
 #define NUM_Z_STEPPER_DRIVERS 2   // (1-4) Z options change based on how many
 
 #if NUM_Z_STEPPER_DRIVERS > 1
-  #define Z_MULTI_ENDSTOPS
-  #if ENABLED(Z_MULTI_ENDSTOPS)
-    #define Z2_USE_ENDSTOP          _XMAX_
-    #define Z2_ENDSTOP_ADJUSTMENT   0
-    #if NUM_Z_STEPPER_DRIVERS >= 3
-      #define Z3_USE_ENDSTOP        _YMAX_
-      #define Z3_ENDSTOP_ADJUSTMENT 0
-    #endif
-    #if NUM_Z_STEPPER_DRIVERS >= 4
-      #define Z4_USE_ENDSTOP        _ZMAX_
-      #define Z4_ENDSTOP_ADJUSTMENT 0
-    #endif
+  #if DISABLED(KNUTWURST_ONE_Z_ENDSTOP)
+    #define Z_MULTI_ENDSTOPS
   #endif
+    #if ENABLED(Z_MULTI_ENDSTOPS)
+      #define Z2_USE_ENDSTOP          _XMAX_
+      #define Z2_ENDSTOP_ADJUSTMENT   0
+      #if NUM_Z_STEPPER_DRIVERS >= 3
+        #define Z3_USE_ENDSTOP        _YMAX_
+        #define Z3_ENDSTOP_ADJUSTMENT 0
+      #endif
+      #if NUM_Z_STEPPER_DRIVERS >= 4
+        #define Z4_USE_ENDSTOP        _ZMAX_
+        #define Z4_ENDSTOP_ADJUSTMENT 0
+      #endif
+    #endif
 #endif
 
 /**
@@ -1486,7 +1488,7 @@
  * Warning: Does not respect endstops!
  */
 #if ENABLED(KNUTWURST_BLTOUCH)
-#define BABYSTEPPING
+    #define BABYSTEPPING
 #endif
 #if ENABLED(BABYSTEPPING)
   //#define INTEGRATED_BABYSTEPPING         // EXPERIMENTAL integration of babystepping into the Stepper ISR