diff --git a/src/arch/x86/Makefile.pcbios b/src/arch/x86/Makefile.pcbios
index df08e0182..c44eefc1f 100644
--- a/src/arch/x86/Makefile.pcbios
+++ b/src/arch/x86/Makefile.pcbios
@@ -106,14 +106,14 @@ NON_AUTO_MEDIA	+= fd0
 	$(Q)sync
 
 # Special target for building Master Boot Record binary
-$(BIN)/mbr.bin : $(BIN)/mbr.o
+$(BIN)/mbr.tmp : $(BIN)/mbr.o
 	$(QM)$(ECHO) "  [LD] $@"
-	$(Q)$(LD) $(LDFLAGS) -o $@ --oformat binary -e 0 $<
+	$(Q)$(LD) $(LDFLAGS) -o $@ -e mbr $<
 
 # rule to make a USB disk image
-$(BIN)/usbdisk.bin : $(BIN)/usbdisk.o
+$(BIN)/usbdisk.tmp : $(BIN)/usbdisk.o
 	$(QM)$(ECHO) "  [LD] $@"
-	$(Q)$(LD) $(LDFLAGS) -o $@ --oformat binary -e 0 $<
+	$(Q)$(LD) $(LDFLAGS) -o $@ -e mbr $<
 
 NON_AUTO_MEDIA	+= usb
 %usb: $(BIN)/usbdisk.bin %hd
diff --git a/src/arch/x86/prefix/mbr.S b/src/arch/x86/prefix/mbr.S
index a1e237de8..032c0e775 100644
--- a/src/arch/x86/prefix/mbr.S
+++ b/src/arch/x86/prefix/mbr.S
@@ -6,6 +6,7 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL )
 	.code16
 	.org 0
 
+	.globl mbr
 mbr:
 	movw	$exec_sector, %bp
 	jmp	find_active_partition