diff --git a/README.adoc b/README.adoc
index 654f837..b826c06 100644
--- a/README.adoc
+++ b/README.adoc
@@ -10437,14 +10437,29 @@ vim "$(./getvar --arch arm run_cmd_file)"
 ./"$(./getvar --arch arm run_cmd_file)"
 ....
 
-Next, you will also want to give the relevant images to save them time, see: <<release-zip>>.
+If you are not already on the master of the given component, you can do that neatly with <<build-variants>>.
 
-Finally, do a clone of the relevant repository out of tree and reproduce the bug there, to be 100% sure that it is an actual upstream bug, and to provide developers with the cleanest possible commands.
+E.g., to check if a QEMU bug is still present on `master`, you can do as explained at <<qemu-build-variants>>:
 
-For QEMU and Buildroot, we have the following convenient setups respectively:
+....
+git -C "$(./getvar qemu_source_dir)" checkout master
+./build-qemu --clean --qemu-build-id master
+./build-qemu --qemu-build-id master
+git -C "$(./getvar qemu_source_dir)" checkout -
+./run --qemu-build-id master
+....
 
-* https://github.com/cirosantilli/qemu-test
-* https://github.com/cirosantilli/buildroot/tree/in-tree-package-master
+Then, you will also want to do a <<bisection>> to pinpoint the exact commit to blame, and CC that developer.
+
+Finally, give the images you used save upstream developpers time: <<release-zip>>.
+
+For Buildroot problems, you should wither provide the config you have:
+
+....
+./getvar buildroot_config_file
+....
+
+or try to reproduce with a minimal config, see: https://github.com/cirosantilli/buildroot/tree/in-tree-package-master
 
 == Baremetal