diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8818ebe..f64a86b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.18.1] - 2025-06-18
+
+### Fixed
+
+- Look for grub.cfg in two places rather than one
+
 ## [0.18.0] - 2025-06-16
 
 ### Added
diff --git a/ogclient/lib/python3/BootLib.py b/ogclient/lib/python3/BootLib.py
index 6f9e7b5..f5f32cb 100644
--- a/ogclient/lib/python3/BootLib.py
+++ b/ogclient/lib/python3/BootLib.py
@@ -129,7 +129,10 @@ def ogBoot (disk, par, nvramperm=False, params=''):
             esp_dev = DiskLib.ogDiskToDev (efidisk, efipart)
             esp_mntdir = esp_dev.replace ('dev', 'mnt')
             os.makedirs (f'{esp_mntdir}/boot/grub', exist_ok=True)
-            shutil.copy2 (f'{esp_mntdir}/EFI/{bootlabel}/Boot/grub.cfg', f'{esp_mntdir}/boot/grub/grub.cfg')
+            grub_cfg_src = f'{esp_mntdir}/EFI/{bootlabel}/Boot/grub.cfg'
+            if not os.path.exists (grub_cfg_src):
+                grub_cfg_src = f'{esp_mntdir}/boot/grubMBR/boot/grub/grub.cfg'
+            shutil.copy2 (grub_cfg_src, f'{esp_mntdir}/boot/grub/grub.cfg')
 
             # Crear orden de arranque (con unos valores por defecto).
             UEFILib.ogNvramAddEntry (bootlabel, f'/EFI/{bootlabel}/Boot/{bootloader}', nvramperm)
@@ -164,7 +167,10 @@ def ogBoot (disk, par, nvramperm=False, params=''):
             esp_dev = DiskLib.ogDiskToDev (efidisk, efipart)
             esp_mntdir = esp_dev.replace ('dev', 'mnt')
             os.makedirs (f'{esp_mntdir}/boot/grub', exist_ok=True)
-            shutil.copy2 (f'{esp_mntdir}/EFI/{bootlabel}/Boot/grub.cfg', f'{esp_mntdir}/boot/grub/grub.cfg')
+            grub_cfg_src = f'{esp_mntdir}/EFI/{bootlabel}/Boot/grub.cfg'
+            if not os.path.exists (grub_cfg_src):
+                grub_cfg_src = f'{esp_mntdir}/boot/grubMBR/boot/grub/grub.cfg'
+            shutil.copy2 (grub_cfg_src, f'{esp_mntdir}/boot/grub/grub.cfg')
 
             # Crear orden de arranque (con unos valores por defecto).
             l = re.sub ('^.*EFI(.*)$', r'\1', loader)