diff --git a/config/sample-probe-as-z-endstop.cfg b/config/sample-probe-as-z-endstop.cfg
index 9ef5df7b..99211674 100644
--- a/config/sample-probe-as-z-endstop.cfg
+++ b/config/sample-probe-as-z-endstop.cfg
@@ -20,16 +20,12 @@ endstop_pin: probe:z_virtual_endstop
 position_min: -2 # The Z carriage may need to travel below the Z=0
                  # homing point if the bed has a significant tilt.
 
-# The homing_override section modifies the default G28 behavior
-[homing_override]
-set_position_z: 0
-axes: z
-gcode:
-    G90
-    ; G1 Z2 F600 ; Uncomment to blindly lift the Z 2mm at start
-    G28 X0 Y0
-    G1 X100 Y100 F3600
-    G28 Z0
+# The safe_z_home section modifies the default G28 behavior
+[safe_z_home]
+home_xy_position: 100,100
+speed: 50
+z_hop: 15
+z_hop_speed: 5
 
 # Example bed_tilt config section
 [bed_tilt]
diff --git a/docs/BLTouch.md b/docs/BLTouch.md
index c99f6035..199ca153 100644
--- a/docs/BLTouch.md
+++ b/docs/BLTouch.md
@@ -20,24 +20,20 @@ control_pin: P1.26
 
 If the BL-Touch will be used to home the Z axis then set `endstop_pin:
 probe:z_virtual_endstop` in the `[stepper_z]` config section and add a
-`[homing_override]` config section to raise the z-axis, home the
-x/y-axis, move to the center of the bed, and home the z-axis. For
-example:
+`[safe_z_home]` config section to raise the z axis, home the xy axes,
+move to the center of the bed, and home the z axis. For example:
 
 ```
-[homing_override]
-gcode:
-    G90 ; Use absolute position mode
-    G1 Z10 ; Move up 10mm
-    G28 X Y
-    G1 X166 Y120 F6000 ; Change the X and Y coordinates to the center of your print bed
-    G28 Z
-set_position_z: 0.0
+[safe_z_home]
+home_xy_position: 100,100 # Change coordinates to the center of your print bed
+speed: 50
+z_hop: 10                 # Move up 10mm
+z_hop_speed: 5
 ```
 
-It's important that the initial Z upwards movement in the
-homing_override is high enough that the probe doesn't hit anything
-even if the probe pin happens to be in its lowest state.
+It's important that the z_hop movement in safe_z_home is high enough
+that the probe doesn't hit anything even if the probe pin happens to
+be in its lowest state.
 
 Initial tests
 =============
diff --git a/docs/FAQ.md b/docs/FAQ.md
index 56490520..e3e3b163 100644
--- a/docs/FAQ.md
+++ b/docs/FAQ.md
@@ -211,9 +211,10 @@ the desired movement to the "custom g-code" section of your slicer.
 
 If the printer requires some additional movement as part of the homing
 process itself (or fundamentally does not have a homing process) then
-consider using a homing_override section in the config file. If you
-need to move a stepper for diagnostic or debugging purposes then
-consider adding a force_move section to the config file. See
+consider using a safe_z_home or homing_override section in the config
+file. If you need to move a stepper for diagnostic or debugging
+purposes then consider adding a force_move section to the config
+file. See
 [example-extras.cfg](https://github.com/KevinOConnor/klipper/tree/master/config/example-extras.cfg)
 for further details on these options.