Index: /trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Library/UefiBootManagerLib/BmBoot.c
===================================================================
--- /trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Library/UefiBootManagerLib/BmBoot.c	(revision 82518)
+++ /trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Library/UefiBootManagerLib/BmBoot.c	(revision 82519)
@@ -1016,4 +1016,16 @@
     if (!EFI_ERROR(Status))
     {
+#if 1
+# define VBOX_EFI_APPLE_MEDIA_FILE_NAME L"\\System\\Library\\CoreServices\\boot.efi"
+       EFI_FILE_PROTOCOL *pFile = NULL;
+
+       Status = pRoot->Open(pRoot, &pFile, VBOX_EFI_APPLE_MEDIA_FILE_NAME, EFI_FILE_MODE_READ,
+                            EFI_FILE_READ_ONLY | EFI_FILE_HIDDEN | EFI_FILE_SYSTEM);
+       if (!EFI_ERROR(Status))
+       {
+         *ppwszFileName = VBOX_EFI_APPLE_MEDIA_FILE_NAME;
+         pFile->Close(pFile);
+       }
+#else /* Doesn't quite work yet. */
       VBOX_FS_BLESSED_FILE *Buffer = NULL;
       UINTN BufferSize = 0;
@@ -1034,4 +1046,5 @@
         }
       }
+#endif
 
       pRoot->Close(pRoot);