diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index 4bfdf1d366..512582e630 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -3492,6 +3492,25 @@
   //#define JOY_Z_LIMITS { 4800, 8080-100, 8080+100, 11550 }
 #endif
 
+/**
+ * Modern replacement for the Prusa TMC_Z_CALIBRATION
+ * Adds capability to work with any adjustable current drivers
+ * Implements as G34 as M915 is deprecated
+ */
+
+//#define MECHANICAL_GANTRY_CALIBRATION
+#if ENABLED(MECHANICAL_GANTRY_CALIBRATION)
+  #define GANTRY_CALIBRATION_CURRENT          600                   // Default calibration current in ma
+  #define GANTRY_CALIBRATION_EXTRA_HEIGHT      15                   // Extra distance in mm past Z_###_POS to move
+  #define GANTRY_CALIBRATION_DIRECTION          1                   // Set to 1 for Max or 0 for min
+  #define GANTRY_CALIBRATION_FEEDRATE         500                   // Feedrate for correction move
+
+  //#define GANTRY_CALIBRATION_SAFE_POSITION  {X_CENTER, Y_CENTER}  // Safe position for nozzle
+  //#define GANTRY_CALIBRATION_XY_PARK_FEEDRATE 3000                // XY Park Feedrate - MMM
+  //#define GANTRY_CALIBRATION_COMMANDS_PRE   ""
+  //#define GANTRY_CALIBRATION_COMMANDS_POST  "G28"
+#endif
+
 /**
  * MAX7219 Debug Matrix
  *