diff --git a/troubleshooting/uefi-troubleshooting.md b/troubleshooting/uefi-troubleshooting.md
index 7eebc7c9..f2882422 100644
--- a/troubleshooting/uefi-troubleshooting.md
+++ b/troubleshooting/uefi-troubleshooting.md
@@ -18,15 +18,28 @@ There is some [common bug in UEFI implementation](http://xen.markmail.org/messag
 2. At the end of `chainloader` line add `/mapbs /noexitboot`.
 3. Perform installation normally, but not reboot system at the end yet.
 4. Go to `tty2` (Ctrl-Alt-F2).
-5. Execute `mount | grep boot/efi` and note device name (first column). It should be something like `/dev/sda1`.
-6. Execute `efibootmgr -v`, search for `Qubes` entry and note its number (it should be something like `Boot0001` - `0001` is an entry number).
-7. Replace existing `Qubes` entry with modified one. Replace `XXXX` with entry number from previous step, `/dev/sda` with your disk name and `-p 1` with `/boot/efi` partition number):
+5. Enable `/mapbs /noexitboot` on just installed system. This step differs between Qubes releases:
+   
+    * for Qubes 3.1:
 
-        efibootmgr -b XXXX -B
-        efibootmgr -v -c -u -L Qubes -l /EFI/qubes/xen.efi -d /dev/sda -p 1 "placeholder /mapbs /noexitboot"
+        5. Execute `mount | grep boot/efi` and note device name (first column). It should be something like `/dev/sda1`.
+        6. Execute `efibootmgr -v`, search for `Qubes` entry and note its number (it should be something like `Boot0001` - `0001` is an entry number).
+        7. Replace existing `Qubes` entry with modified one. Replace `XXXX` with entry number from previous step, `/dev/sda` with your disk name and `-p 1` with `/boot/efi` partition number):
 
-8. Compare new entry with the old one (printed in step 6) - it should only differ in additional options at the end.
-9. Now you can reboot the system by issuing `reboot` command.
+               efibootmgr -b XXXX -B
+               efibootmgr -v -c -u -L Qubes -l /EFI/qubes/xen.efi -d /dev/sda -p 1 "placeholder /mapbs /noexitboot"
+
+        8. Compare new entry with the old one (printed in step 6) - it should only differ in additional options at the end.
+        9. Now you can reboot the system by issuing `reboot` command.
+
+    * for Qubes 3.2 or later:
+
+        5. Edit `/mnt/sysimage/boot/efi/EFI/qubes/xen.cfg` (you can use `vi` editor) and add to every kernel section:
+            
+               mapbs=1
+               noexitboot=1
+
+        9. Now you can reboot the system by issuing `reboot` command.
 
 
 System crash/restart when booting installer