diff --git a/src/arch/i386/Makefile b/src/arch/i386/Makefile
index 58915b8f9..89393d06c 100644
--- a/src/arch/i386/Makefile
+++ b/src/arch/i386/Makefile
@@ -80,20 +80,11 @@ PIE_FLAGS := $(shell $(PIE_TEST) && $(ECHO) '-fno-PIE -nopie')
 WORKAROUND_CFLAGS += $(PIE_FLAGS)
 endif
 
-# Define version string for lkrnprefix.S
-#
-CFLAGS_lkrnprefix	+= -DVERSION="\"$(VERSION)\""
-
 # i386-specific directories containing source files
 #
-SRCDIRS		+= arch/i386/core arch/i386/transitions arch/i386/prefix
-SRCDIRS		+= arch/i386/firmware/pcbios
+SRCDIRS		+= arch/i386/core
 SRCDIRS		+= arch/i386/image
-SRCDIRS		+= arch/i386/interface/pcbios
-SRCDIRS		+= arch/i386/interface/pxe
-SRCDIRS		+= arch/i386/interface/pxeparent
-SRCDIRS 	+= arch/i386/interface/syslinux
-SRCDIRS		+= arch/i386/hci/commands
+SRCDIRS		+= arch/i386/interface/syslinux
 
 # Include common x86 Makefile
 #
diff --git a/src/arch/i386/Makefile.pcbios b/src/arch/i386/Makefile.pcbios
index 8ae37399f..dfb8db0a0 100644
--- a/src/arch/i386/Makefile.pcbios
+++ b/src/arch/i386/Makefile.pcbios
@@ -1,123 +1,6 @@
 # -*- makefile -*- : Force emacs to use Makefile mode
 
-# The i386 linker script
+# Include generic BIOS Makefile
 #
-LDSCRIPT	= arch/i386/scripts/i386.lds
-
-# Stop ld from complaining about our customised linker script
-#
-LDFLAGS		+= -N --no-check-sections
-
-# pcbios specific drivers
-SRCDIRS		+= arch/i386/drivers
-SRCDIRS		+= arch/i386/drivers/net
-
-# Media types.
-#
-MEDIA		+= rom
-MEDIA		+= mrom
-MEDIA		+= pcirom
-MEDIA		+= isarom
-MEDIA		+= pxe
-MEDIA		+= kpxe
-MEDIA		+= kkpxe
-MEDIA		+= kkkpxe
-MEDIA		+= lkrn
-MEDIA		+= dsk
-MEDIA		+= nbi
-MEDIA		+= hd
-MEDIA		+= raw
-MEDIA		+= exe
-
-# Padding rules
-#
-PAD_rom		= $(PERL) $(PADIMG) --blksize=512 --byte=0xff
-PAD_mrom	= $(PAD_rom)
-PAD_pcirom	= $(PAD_rom)
-PAD_isarom	= $(PAD_rom)
-PAD_dsk		= $(PERL) $(PADIMG) --blksize=512
-PAD_hd		= $(PERL) $(PADIMG) --blksize=32768
-PAD_exe		= $(PERL) $(PADIMG) --blksize=512
-
-# Finalisation rules
-#
-FINALISE_rom	= $(PERL) $(FIXROM)
-FINALISE_mrom	= $(FINALISE_rom)
-FINALISE_pcirom	= $(FINALISE_rom)
-FINALISE_isarom	= $(FINALISE_rom)
-
-# Use $(ROMS) rather than $(DRIVERS) for "allroms", "allmroms", etc.
-#
-LIST_NAME_rom := ROMS
-LIST_NAME_mrom := ROMS
-LIST_NAME_pcirom := ROMS
-LIST_NAME_isarom := ROMS
-
-# Locations of isolinux files
-#
-SYSLINUX_DIR_LIST	:= \
-	/usr/lib/syslinux \
-	/usr/lib/syslinux/bios \
-	/usr/lib/syslinux/modules/bios \
-	/usr/share/syslinux \
-	/usr/share/syslinux/bios \
-	/usr/share/syslinux/modules/bios \
-	/usr/local/share/syslinux \
-	/usr/local/share/syslinux/bios \
-	/usr/local/share/syslinux/modules/bios \
-	/usr/lib/ISOLINUX
-ISOLINUX_BIN_LIST	:= \
-	$(ISOLINUX_BIN) \
-	$(patsubst %,%/isolinux.bin,$(SYSLINUX_DIR_LIST))
-LDLINUX_C32_LIST	:= \
-	$(LDLINUX_C32) \
-	$(patsubst %,%/ldlinux.c32,$(SYSLINUX_DIR_LIST))
-ISOLINUX_BIN	= $(firstword $(wildcard $(ISOLINUX_BIN_LIST)))
-LDLINUX_C32	= $(firstword $(wildcard $(LDLINUX_C32_LIST)))
-
-# rule to make a non-emulation ISO boot image
-NON_AUTO_MEDIA	+= iso
-%iso:	%lkrn util/geniso
-	$(QM)$(ECHO) "  [GENISO] $@"
-	$(Q)ISOLINUX_BIN=$(ISOLINUX_BIN) LDLINUX_C32=$(LDLINUX_C32) \
-	    VERSION="$(VERSION)" bash util/geniso -o $@ $<
-
-# rule to make a floppy emulation ISO boot image
-NON_AUTO_MEDIA	+= liso
-%liso:	%lkrn util/geniso
-	$(QM)$(ECHO) "  [GENISO] $@"
-	$(Q)VERSION="$(VERSION)" bash util/geniso -l -o $@ $<
-
-# rule to make a syslinux floppy image (mountable, bootable)
-NON_AUTO_MEDIA	+= sdsk
-%sdsk:	%lkrn util/gensdsk
-	$(QM)$(ECHO) "  [GENSDSK] $@"
-	$(Q)bash util/gensdsk $@ $<
-
-# rule to write disk images to /dev/fd0
-NON_AUTO_MEDIA	+= fd0
-%fd0 : %dsk
-	$(QM)$(ECHO) "  [DD] $@"
-	$(Q)dd if=$< bs=512 conv=sync of=/dev/fd0
-	$(Q)sync
-
-# Special target for building Master Boot Record binary
-$(BIN)/mbr.bin : $(BIN)/mbr.o
-	$(QM)$(ECHO) "  [OBJCOPY] $@"
-	$(Q)$(OBJCOPY) -O binary $< $@
-
-# rule to make a USB disk image
-$(BIN)/usbdisk.bin : $(BIN)/usbdisk.o
-	$(QM)$(ECHO) "  [OBJCOPY] $@"
-	$(Q)$(OBJCOPY) -O binary $< $@
-
-NON_AUTO_MEDIA	+= usb
-%usb: $(BIN)/usbdisk.bin %hd
-	$(QM)$(ECHO) "  [FINISH] $@"
-	$(Q)cat $^ > $@
-
-# Padded floppy image (e.g. for iLO)
-NON_AUTO_MEDIA += pdsk
-%pdsk : %dsk
-	$(Q)cp $< $@
-	$(Q)$(PADIMG) --blksize=1474560 $@
+MAKEDEPS	+= arch/x86/Makefile.pcbios
+include arch/x86/Makefile.pcbios
diff --git a/src/arch/x86/Makefile b/src/arch/x86/Makefile
index 4ab741db7..6ad8031fd 100644
--- a/src/arch/x86/Makefile
+++ b/src/arch/x86/Makefile
@@ -5,12 +5,17 @@ INCDIRS		+= arch/x86/include
 # x86-specific directories containing source files
 #
 SRCDIRS		+= arch/x86/core
+SRCDIRS		+= arch/x86/image
+SRCDIRS		+= arch/x86/interface/pcbios
+SRCDIRS		+= arch/x86/interface/pxe
+SRCDIRS		+= arch/x86/interface/pxeparent
 SRCDIRS		+= arch/x86/interface/efi
 SRCDIRS		+= arch/x86/interface/vmware
 SRCDIRS		+= arch/x86/prefix
 SRCDIRS		+= arch/x86/hci/commands
 SRCDIRS		+= arch/x86/drivers/xen
 SRCDIRS		+= arch/x86/drivers/hyperv
+SRCDIRS		+= arch/x86/transitions
 
 # breaks building some of the linux-related objects
 CFLAGS		+= -Ulinux
@@ -18,6 +23,10 @@ CFLAGS		+= -Ulinux
 # disable valgrind
 CFLAGS		+= -DNVALGRIND
 
+# Define version string for lkrnprefix.S
+#
+CFLAGS_lkrnprefix	+= -DVERSION="\"$(VERSION)\""
+
 # Include Hyper-V driver in the all-drivers build
 #
 DRIVERS_hyperv += hyperv
diff --git a/src/arch/x86/Makefile.pcbios b/src/arch/x86/Makefile.pcbios
new file mode 100644
index 000000000..18a6f7597
--- /dev/null
+++ b/src/arch/x86/Makefile.pcbios
@@ -0,0 +1,123 @@
+# -*- makefile -*- : Force emacs to use Makefile mode
+
+# BIOS-specific directories containing source files
+#
+SRCDIRS		+= arch/x86/drivers/net
+
+# The i386 linker script
+#
+LDSCRIPT	= arch/x86/scripts/pcbios.lds
+
+# Stop ld from complaining about our customised linker script
+#
+LDFLAGS		+= -N --no-check-sections
+
+# Media types.
+#
+MEDIA		+= rom
+MEDIA		+= mrom
+MEDIA		+= pcirom
+MEDIA		+= isarom
+MEDIA		+= pxe
+MEDIA		+= kpxe
+MEDIA		+= kkpxe
+MEDIA		+= kkkpxe
+MEDIA		+= lkrn
+MEDIA		+= dsk
+MEDIA		+= nbi
+MEDIA		+= hd
+MEDIA		+= raw
+MEDIA		+= exe
+
+# Padding rules
+#
+PAD_rom		= $(PERL) $(PADIMG) --blksize=512 --byte=0xff
+PAD_mrom	= $(PAD_rom)
+PAD_pcirom	= $(PAD_rom)
+PAD_isarom	= $(PAD_rom)
+PAD_dsk		= $(PERL) $(PADIMG) --blksize=512
+PAD_hd		= $(PERL) $(PADIMG) --blksize=32768
+PAD_exe		= $(PERL) $(PADIMG) --blksize=512
+
+# Finalisation rules
+#
+FINALISE_rom	= $(PERL) $(FIXROM)
+FINALISE_mrom	= $(FINALISE_rom)
+FINALISE_pcirom	= $(FINALISE_rom)
+FINALISE_isarom	= $(FINALISE_rom)
+
+# Use $(ROMS) rather than $(DRIVERS) for "allroms", "allmroms", etc.
+#
+LIST_NAME_rom := ROMS
+LIST_NAME_mrom := ROMS
+LIST_NAME_pcirom := ROMS
+LIST_NAME_isarom := ROMS
+
+# Locations of isolinux files
+#
+SYSLINUX_DIR_LIST	:= \
+	/usr/lib/syslinux \
+	/usr/lib/syslinux/bios \
+	/usr/lib/syslinux/modules/bios \
+	/usr/share/syslinux \
+	/usr/share/syslinux/bios \
+	/usr/share/syslinux/modules/bios \
+	/usr/local/share/syslinux \
+	/usr/local/share/syslinux/bios \
+	/usr/local/share/syslinux/modules/bios \
+	/usr/lib/ISOLINUX
+ISOLINUX_BIN_LIST	:= \
+	$(ISOLINUX_BIN) \
+	$(patsubst %,%/isolinux.bin,$(SYSLINUX_DIR_LIST))
+LDLINUX_C32_LIST	:= \
+	$(LDLINUX_C32) \
+	$(patsubst %,%/ldlinux.c32,$(SYSLINUX_DIR_LIST))
+ISOLINUX_BIN	= $(firstword $(wildcard $(ISOLINUX_BIN_LIST)))
+LDLINUX_C32	= $(firstword $(wildcard $(LDLINUX_C32_LIST)))
+
+# rule to make a non-emulation ISO boot image
+NON_AUTO_MEDIA	+= iso
+%iso:	%lkrn util/geniso
+	$(QM)$(ECHO) "  [GENISO] $@"
+	$(Q)ISOLINUX_BIN=$(ISOLINUX_BIN) LDLINUX_C32=$(LDLINUX_C32) \
+	    VERSION="$(VERSION)" bash util/geniso -o $@ $<
+
+# rule to make a floppy emulation ISO boot image
+NON_AUTO_MEDIA	+= liso
+%liso:	%lkrn util/geniso
+	$(QM)$(ECHO) "  [GENISO] $@"
+	$(Q)VERSION="$(VERSION)" bash util/geniso -l -o $@ $<
+
+# rule to make a syslinux floppy image (mountable, bootable)
+NON_AUTO_MEDIA	+= sdsk
+%sdsk:	%lkrn util/gensdsk
+	$(QM)$(ECHO) "  [GENSDSK] $@"
+	$(Q)bash util/gensdsk $@ $<
+
+# rule to write disk images to /dev/fd0
+NON_AUTO_MEDIA	+= fd0
+%fd0 : %dsk
+	$(QM)$(ECHO) "  [DD] $@"
+	$(Q)dd if=$< bs=512 conv=sync of=/dev/fd0
+	$(Q)sync
+
+# Special target for building Master Boot Record binary
+$(BIN)/mbr.bin : $(BIN)/mbr.o
+	$(QM)$(ECHO) "  [OBJCOPY] $@"
+	$(Q)$(OBJCOPY) -O binary $< $@
+
+# rule to make a USB disk image
+$(BIN)/usbdisk.bin : $(BIN)/usbdisk.o
+	$(QM)$(ECHO) "  [OBJCOPY] $@"
+	$(Q)$(OBJCOPY) -O binary $< $@
+
+NON_AUTO_MEDIA	+= usb
+%usb: $(BIN)/usbdisk.bin %hd
+	$(QM)$(ECHO) "  [FINISH] $@"
+	$(Q)cat $^ > $@
+
+# Padded floppy image (e.g. for iLO)
+NON_AUTO_MEDIA += pdsk
+%pdsk : %dsk
+	$(Q)cp $< $@
+	$(Q)$(PADIMG) --blksize=1474560 $@
diff --git a/src/arch/i386/core/basemem_packet.c b/src/arch/x86/core/basemem_packet.c
similarity index 100%
rename from src/arch/i386/core/basemem_packet.c
rename to src/arch/x86/core/basemem_packet.c
diff --git a/src/arch/i386/core/cachedhcp.c b/src/arch/x86/core/cachedhcp.c
similarity index 100%
rename from src/arch/i386/core/cachedhcp.c
rename to src/arch/x86/core/cachedhcp.c
diff --git a/src/arch/i386/core/dumpregs.c b/src/arch/x86/core/dumpregs.c
similarity index 100%
rename from src/arch/i386/core/dumpregs.c
rename to src/arch/x86/core/dumpregs.c
diff --git a/src/arch/i386/core/patch_cf.S b/src/arch/x86/core/patch_cf.S
similarity index 100%
rename from src/arch/i386/core/patch_cf.S
rename to src/arch/x86/core/patch_cf.S
diff --git a/src/arch/i386/core/pci_autoboot.c b/src/arch/x86/core/pci_autoboot.c
similarity index 100%
rename from src/arch/i386/core/pci_autoboot.c
rename to src/arch/x86/core/pci_autoboot.c
diff --git a/src/arch/i386/core/rdtsc_timer.c b/src/arch/x86/core/rdtsc_timer.c
similarity index 100%
rename from src/arch/i386/core/rdtsc_timer.c
rename to src/arch/x86/core/rdtsc_timer.c
diff --git a/src/arch/i386/core/relocate.c b/src/arch/x86/core/relocate.c
similarity index 100%
rename from src/arch/i386/core/relocate.c
rename to src/arch/x86/core/relocate.c
diff --git a/src/arch/i386/core/runtime.c b/src/arch/x86/core/runtime.c
similarity index 100%
rename from src/arch/i386/core/runtime.c
rename to src/arch/x86/core/runtime.c
diff --git a/src/arch/i386/core/stack.S b/src/arch/x86/core/stack.S
similarity index 100%
rename from src/arch/i386/core/stack.S
rename to src/arch/x86/core/stack.S
diff --git a/src/arch/i386/core/stack16.S b/src/arch/x86/core/stack16.S
similarity index 100%
rename from src/arch/i386/core/stack16.S
rename to src/arch/x86/core/stack16.S
diff --git a/src/arch/i386/core/video_subr.c b/src/arch/x86/core/video_subr.c
similarity index 100%
rename from src/arch/i386/core/video_subr.c
rename to src/arch/x86/core/video_subr.c
diff --git a/src/arch/i386/core/virtaddr.S b/src/arch/x86/core/virtaddr.S
similarity index 100%
rename from src/arch/i386/core/virtaddr.S
rename to src/arch/x86/core/virtaddr.S
diff --git a/src/arch/i386/drivers/net/undi.c b/src/arch/x86/drivers/net/undi.c
similarity index 100%
rename from src/arch/i386/drivers/net/undi.c
rename to src/arch/x86/drivers/net/undi.c
diff --git a/src/arch/i386/drivers/net/undiisr.S b/src/arch/x86/drivers/net/undiisr.S
similarity index 100%
rename from src/arch/i386/drivers/net/undiisr.S
rename to src/arch/x86/drivers/net/undiisr.S
diff --git a/src/arch/i386/drivers/net/undiload.c b/src/arch/x86/drivers/net/undiload.c
similarity index 100%
rename from src/arch/i386/drivers/net/undiload.c
rename to src/arch/x86/drivers/net/undiload.c
diff --git a/src/arch/i386/drivers/net/undinet.c b/src/arch/x86/drivers/net/undinet.c
similarity index 100%
rename from src/arch/i386/drivers/net/undinet.c
rename to src/arch/x86/drivers/net/undinet.c
diff --git a/src/arch/i386/drivers/net/undionly.c b/src/arch/x86/drivers/net/undionly.c
similarity index 100%
rename from src/arch/i386/drivers/net/undionly.c
rename to src/arch/x86/drivers/net/undionly.c
diff --git a/src/arch/i386/drivers/net/undipreload.c b/src/arch/x86/drivers/net/undipreload.c
similarity index 100%
rename from src/arch/i386/drivers/net/undipreload.c
rename to src/arch/x86/drivers/net/undipreload.c
diff --git a/src/arch/i386/drivers/net/undirom.c b/src/arch/x86/drivers/net/undirom.c
similarity index 100%
rename from src/arch/i386/drivers/net/undirom.c
rename to src/arch/x86/drivers/net/undirom.c
diff --git a/src/arch/i386/hci/commands/pxe_cmd.c b/src/arch/x86/hci/commands/pxe_cmd.c
similarity index 100%
rename from src/arch/i386/hci/commands/pxe_cmd.c
rename to src/arch/x86/hci/commands/pxe_cmd.c
diff --git a/src/arch/i386/image/bootsector.c b/src/arch/x86/image/bootsector.c
similarity index 100%
rename from src/arch/i386/image/bootsector.c
rename to src/arch/x86/image/bootsector.c
diff --git a/src/arch/i386/image/bzimage.c b/src/arch/x86/image/bzimage.c
similarity index 100%
rename from src/arch/i386/image/bzimage.c
rename to src/arch/x86/image/bzimage.c
diff --git a/src/arch/i386/image/elfboot.c b/src/arch/x86/image/elfboot.c
similarity index 100%
rename from src/arch/i386/image/elfboot.c
rename to src/arch/x86/image/elfboot.c
diff --git a/src/arch/i386/image/initrd.c b/src/arch/x86/image/initrd.c
similarity index 100%
rename from src/arch/i386/image/initrd.c
rename to src/arch/x86/image/initrd.c
diff --git a/src/arch/i386/image/multiboot.c b/src/arch/x86/image/multiboot.c
similarity index 100%
rename from src/arch/i386/image/multiboot.c
rename to src/arch/x86/image/multiboot.c
diff --git a/src/arch/i386/image/nbi.c b/src/arch/x86/image/nbi.c
similarity index 100%
rename from src/arch/i386/image/nbi.c
rename to src/arch/x86/image/nbi.c
diff --git a/src/arch/i386/image/pxe_image.c b/src/arch/x86/image/pxe_image.c
similarity index 100%
rename from src/arch/i386/image/pxe_image.c
rename to src/arch/x86/image/pxe_image.c
diff --git a/src/arch/i386/image/sdi.c b/src/arch/x86/image/sdi.c
similarity index 100%
rename from src/arch/i386/image/sdi.c
rename to src/arch/x86/image/sdi.c
diff --git a/src/arch/i386/include/basemem.h b/src/arch/x86/include/basemem.h
similarity index 100%
rename from src/arch/i386/include/basemem.h
rename to src/arch/x86/include/basemem.h
diff --git a/src/arch/i386/include/basemem_packet.h b/src/arch/x86/include/basemem_packet.h
similarity index 100%
rename from src/arch/i386/include/basemem_packet.h
rename to src/arch/x86/include/basemem_packet.h
diff --git a/src/arch/i386/include/bios.h b/src/arch/x86/include/bios.h
similarity index 100%
rename from src/arch/i386/include/bios.h
rename to src/arch/x86/include/bios.h
diff --git a/src/arch/i386/include/bios_disks.h b/src/arch/x86/include/bios_disks.h
similarity index 100%
rename from src/arch/i386/include/bios_disks.h
rename to src/arch/x86/include/bios_disks.h
diff --git a/src/arch/i386/include/biosint.h b/src/arch/x86/include/biosint.h
similarity index 100%
rename from src/arch/i386/include/biosint.h
rename to src/arch/x86/include/biosint.h
diff --git a/src/arch/i386/include/bits/entropy.h b/src/arch/x86/include/bits/entropy.h
similarity index 79%
rename from src/arch/i386/include/bits/entropy.h
rename to src/arch/x86/include/bits/entropy.h
index bfeb5e3b5..5ac7fcd2e 100644
--- a/src/arch/i386/include/bits/entropy.h
+++ b/src/arch/x86/include/bits/entropy.h
@@ -3,7 +3,7 @@
 
 /** @file
  *
- * i386-specific entropy API implementations
+ * x86-specific entropy API implementations
  *
  */
 
diff --git a/src/arch/i386/include/bits/nap.h b/src/arch/x86/include/bits/nap.h
similarity index 79%
rename from src/arch/i386/include/bits/nap.h
rename to src/arch/x86/include/bits/nap.h
index e8bcfd13b..7103b94c0 100644
--- a/src/arch/i386/include/bits/nap.h
+++ b/src/arch/x86/include/bits/nap.h
@@ -3,7 +3,7 @@
 
 /** @file
  *
- * i386-specific CPU sleeping API implementations
+ * x86-specific CPU sleeping API implementations
  *
  */
 
diff --git a/src/arch/i386/include/bits/reboot.h b/src/arch/x86/include/bits/reboot.h
similarity index 79%
rename from src/arch/i386/include/bits/reboot.h
rename to src/arch/x86/include/bits/reboot.h
index 803dacfe4..e702dd3d0 100644
--- a/src/arch/i386/include/bits/reboot.h
+++ b/src/arch/x86/include/bits/reboot.h
@@ -3,7 +3,7 @@
 
 /** @file
  *
- * i386-specific reboot API implementations
+ * x86-specific reboot API implementations
  *
  */
 
diff --git a/src/arch/i386/include/bits/sanboot.h b/src/arch/x86/include/bits/sanboot.h
similarity index 79%
rename from src/arch/i386/include/bits/sanboot.h
rename to src/arch/x86/include/bits/sanboot.h
index f02d2e649..1b9924e64 100644
--- a/src/arch/i386/include/bits/sanboot.h
+++ b/src/arch/x86/include/bits/sanboot.h
@@ -3,7 +3,7 @@
 
 /** @file
  *
- * i386-specific sanboot API implementations
+ * x86-specific sanboot API implementations
  *
  */
 
diff --git a/src/arch/i386/include/bits/smbios.h b/src/arch/x86/include/bits/smbios.h
similarity index 79%
rename from src/arch/i386/include/bits/smbios.h
rename to src/arch/x86/include/bits/smbios.h
index 2ab31e74b..9977c87ac 100644
--- a/src/arch/i386/include/bits/smbios.h
+++ b/src/arch/x86/include/bits/smbios.h
@@ -3,7 +3,7 @@
 
 /** @file
  *
- * i386-specific SMBIOS API implementations
+ * x86-specific SMBIOS API implementations
  *
  */
 
diff --git a/src/arch/i386/include/bits/time.h b/src/arch/x86/include/bits/time.h
similarity index 79%
rename from src/arch/i386/include/bits/time.h
rename to src/arch/x86/include/bits/time.h
index 6a5d63d32..556d96f64 100644
--- a/src/arch/i386/include/bits/time.h
+++ b/src/arch/x86/include/bits/time.h
@@ -3,7 +3,7 @@
 
 /** @file
  *
- * i386-specific time API implementations
+ * x86-specific time API implementations
  *
  */
 
diff --git a/src/arch/i386/include/bits/timer.h b/src/arch/x86/include/bits/timer.h
similarity index 81%
rename from src/arch/i386/include/bits/timer.h
rename to src/arch/x86/include/bits/timer.h
index f7d86d78c..b0ff5ee11 100644
--- a/src/arch/i386/include/bits/timer.h
+++ b/src/arch/x86/include/bits/timer.h
@@ -3,7 +3,7 @@
 
 /** @file
  *
- * i386-specific timer API implementations
+ * x86-specific timer API implementations
  *
  */
 
diff --git a/src/arch/i386/include/bits/uaccess.h b/src/arch/x86/include/bits/uaccess.h
similarity index 76%
rename from src/arch/i386/include/bits/uaccess.h
rename to src/arch/x86/include/bits/uaccess.h
index aac09ba95..e9e7e5af5 100644
--- a/src/arch/i386/include/bits/uaccess.h
+++ b/src/arch/x86/include/bits/uaccess.h
@@ -3,7 +3,7 @@
 
 /** @file
  *
- * i386-specific user access API implementations
+ * x86-specific user access API implementations
  *
  */
 
diff --git a/src/arch/i386/include/bits/umalloc.h b/src/arch/x86/include/bits/umalloc.h
similarity index 74%
rename from src/arch/i386/include/bits/umalloc.h
rename to src/arch/x86/include/bits/umalloc.h
index 113f16fd1..5d1f554d8 100644
--- a/src/arch/i386/include/bits/umalloc.h
+++ b/src/arch/x86/include/bits/umalloc.h
@@ -3,7 +3,7 @@
 
 /** @file
  *
- * i386-specific user memory allocation API implementations
+ * x86-specific user memory allocation API implementations
  *
  */
 
diff --git a/src/arch/i386/include/bochs.h b/src/arch/x86/include/bochs.h
similarity index 100%
rename from src/arch/i386/include/bochs.h
rename to src/arch/x86/include/bochs.h
diff --git a/src/arch/i386/include/bootsector.h b/src/arch/x86/include/bootsector.h
similarity index 100%
rename from src/arch/i386/include/bootsector.h
rename to src/arch/x86/include/bootsector.h
diff --git a/src/arch/i386/include/bzimage.h b/src/arch/x86/include/bzimage.h
similarity index 100%
rename from src/arch/i386/include/bzimage.h
rename to src/arch/x86/include/bzimage.h
diff --git a/src/arch/i386/include/fakee820.h b/src/arch/x86/include/fakee820.h
similarity index 100%
rename from src/arch/i386/include/fakee820.h
rename to src/arch/x86/include/fakee820.h
diff --git a/src/arch/i386/include/initrd.h b/src/arch/x86/include/initrd.h
similarity index 100%
rename from src/arch/i386/include/initrd.h
rename to src/arch/x86/include/initrd.h
diff --git a/src/arch/i386/include/int13.h b/src/arch/x86/include/int13.h
similarity index 100%
rename from src/arch/i386/include/int13.h
rename to src/arch/x86/include/int13.h
diff --git a/src/arch/i386/include/ipxe/bios_nap.h b/src/arch/x86/include/ipxe/bios_nap.h
similarity index 100%
rename from src/arch/i386/include/ipxe/bios_nap.h
rename to src/arch/x86/include/ipxe/bios_nap.h
diff --git a/src/arch/i386/include/ipxe/bios_reboot.h b/src/arch/x86/include/ipxe/bios_reboot.h
similarity index 100%
rename from src/arch/i386/include/ipxe/bios_reboot.h
rename to src/arch/x86/include/ipxe/bios_reboot.h
diff --git a/src/arch/i386/include/ipxe/bios_sanboot.h b/src/arch/x86/include/ipxe/bios_sanboot.h
similarity index 100%
rename from src/arch/i386/include/ipxe/bios_sanboot.h
rename to src/arch/x86/include/ipxe/bios_sanboot.h
diff --git a/src/arch/i386/include/ipxe/bios_smbios.h b/src/arch/x86/include/ipxe/bios_smbios.h
similarity index 100%
rename from src/arch/i386/include/ipxe/bios_smbios.h
rename to src/arch/x86/include/ipxe/bios_smbios.h
diff --git a/src/arch/i386/include/ipxe/bios_timer.h b/src/arch/x86/include/ipxe/bios_timer.h
similarity index 100%
rename from src/arch/i386/include/ipxe/bios_timer.h
rename to src/arch/x86/include/ipxe/bios_timer.h
diff --git a/src/arch/i386/include/ipxe/errno/pcbios.h b/src/arch/x86/include/ipxe/errno/pcbios.h
similarity index 100%
rename from src/arch/i386/include/ipxe/errno/pcbios.h
rename to src/arch/x86/include/ipxe/errno/pcbios.h
diff --git a/src/arch/i386/include/ipxe/memtop_umalloc.h b/src/arch/x86/include/ipxe/memtop_umalloc.h
similarity index 100%
rename from src/arch/i386/include/ipxe/memtop_umalloc.h
rename to src/arch/x86/include/ipxe/memtop_umalloc.h
diff --git a/src/arch/i386/include/ipxe/rdtsc_timer.h b/src/arch/x86/include/ipxe/rdtsc_timer.h
similarity index 100%
rename from src/arch/i386/include/ipxe/rdtsc_timer.h
rename to src/arch/x86/include/ipxe/rdtsc_timer.h
diff --git a/src/arch/i386/include/ipxe/rtc_entropy.h b/src/arch/x86/include/ipxe/rtc_entropy.h
similarity index 100%
rename from src/arch/i386/include/ipxe/rtc_entropy.h
rename to src/arch/x86/include/ipxe/rtc_entropy.h
diff --git a/src/arch/i386/include/ipxe/rtc_time.h b/src/arch/x86/include/ipxe/rtc_time.h
similarity index 100%
rename from src/arch/i386/include/ipxe/rtc_time.h
rename to src/arch/x86/include/ipxe/rtc_time.h
diff --git a/src/arch/i386/include/ipxe/vesafb.h b/src/arch/x86/include/ipxe/vesafb.h
similarity index 100%
rename from src/arch/i386/include/ipxe/vesafb.h
rename to src/arch/x86/include/ipxe/vesafb.h
diff --git a/src/arch/i386/include/kir.h b/src/arch/x86/include/kir.h
similarity index 100%
rename from src/arch/i386/include/kir.h
rename to src/arch/x86/include/kir.h
diff --git a/src/arch/i386/include/libkir.h b/src/arch/x86/include/libkir.h
similarity index 100%
rename from src/arch/i386/include/libkir.h
rename to src/arch/x86/include/libkir.h
diff --git a/src/arch/i386/include/librm.h b/src/arch/x86/include/librm.h
similarity index 100%
rename from src/arch/i386/include/librm.h
rename to src/arch/x86/include/librm.h
diff --git a/src/arch/i386/include/memsizes.h b/src/arch/x86/include/memsizes.h
similarity index 100%
rename from src/arch/i386/include/memsizes.h
rename to src/arch/x86/include/memsizes.h
diff --git a/src/arch/i386/include/multiboot.h b/src/arch/x86/include/multiboot.h
similarity index 100%
rename from src/arch/i386/include/multiboot.h
rename to src/arch/x86/include/multiboot.h
diff --git a/src/arch/i386/include/pnpbios.h b/src/arch/x86/include/pnpbios.h
similarity index 100%
rename from src/arch/i386/include/pnpbios.h
rename to src/arch/x86/include/pnpbios.h
diff --git a/src/arch/i386/include/pxe.h b/src/arch/x86/include/pxe.h
similarity index 100%
rename from src/arch/i386/include/pxe.h
rename to src/arch/x86/include/pxe.h
diff --git a/src/arch/i386/include/pxe_api.h b/src/arch/x86/include/pxe_api.h
similarity index 100%
rename from src/arch/i386/include/pxe_api.h
rename to src/arch/x86/include/pxe_api.h
diff --git a/src/arch/i386/include/pxe_call.h b/src/arch/x86/include/pxe_call.h
similarity index 100%
rename from src/arch/i386/include/pxe_call.h
rename to src/arch/x86/include/pxe_call.h
diff --git a/src/arch/i386/include/pxe_error.h b/src/arch/x86/include/pxe_error.h
similarity index 100%
rename from src/arch/i386/include/pxe_error.h
rename to src/arch/x86/include/pxe_error.h
diff --git a/src/arch/i386/include/pxe_types.h b/src/arch/x86/include/pxe_types.h
similarity index 100%
rename from src/arch/i386/include/pxe_types.h
rename to src/arch/x86/include/pxe_types.h
diff --git a/src/arch/i386/include/pxeparent.h b/src/arch/x86/include/pxeparent.h
similarity index 100%
rename from src/arch/i386/include/pxeparent.h
rename to src/arch/x86/include/pxeparent.h
diff --git a/src/arch/i386/include/realmode.h b/src/arch/x86/include/realmode.h
similarity index 100%
rename from src/arch/i386/include/realmode.h
rename to src/arch/x86/include/realmode.h
diff --git a/src/arch/i386/include/registers.h b/src/arch/x86/include/registers.h
similarity index 100%
rename from src/arch/i386/include/registers.h
rename to src/arch/x86/include/registers.h
diff --git a/src/arch/i386/include/rmsetjmp.h b/src/arch/x86/include/rmsetjmp.h
similarity index 100%
rename from src/arch/i386/include/rmsetjmp.h
rename to src/arch/x86/include/rmsetjmp.h
diff --git a/src/arch/i386/include/rtc.h b/src/arch/x86/include/rtc.h
similarity index 100%
rename from src/arch/i386/include/rtc.h
rename to src/arch/x86/include/rtc.h
diff --git a/src/arch/i386/include/sdi.h b/src/arch/x86/include/sdi.h
similarity index 100%
rename from src/arch/i386/include/sdi.h
rename to src/arch/x86/include/sdi.h
diff --git a/src/arch/i386/include/undi.h b/src/arch/x86/include/undi.h
similarity index 100%
rename from src/arch/i386/include/undi.h
rename to src/arch/x86/include/undi.h
diff --git a/src/arch/i386/include/undiload.h b/src/arch/x86/include/undiload.h
similarity index 100%
rename from src/arch/i386/include/undiload.h
rename to src/arch/x86/include/undiload.h
diff --git a/src/arch/i386/include/undinet.h b/src/arch/x86/include/undinet.h
similarity index 100%
rename from src/arch/i386/include/undinet.h
rename to src/arch/x86/include/undinet.h
diff --git a/src/arch/i386/include/undipreload.h b/src/arch/x86/include/undipreload.h
similarity index 100%
rename from src/arch/i386/include/undipreload.h
rename to src/arch/x86/include/undipreload.h
diff --git a/src/arch/i386/include/undirom.h b/src/arch/x86/include/undirom.h
similarity index 100%
rename from src/arch/i386/include/undirom.h
rename to src/arch/x86/include/undirom.h
diff --git a/src/arch/i386/include/vga.h b/src/arch/x86/include/vga.h
similarity index 100%
rename from src/arch/i386/include/vga.h
rename to src/arch/x86/include/vga.h
diff --git a/src/arch/i386/interface/pcbios/apm.c b/src/arch/x86/interface/pcbios/apm.c
similarity index 100%
rename from src/arch/i386/interface/pcbios/apm.c
rename to src/arch/x86/interface/pcbios/apm.c
diff --git a/src/arch/i386/firmware/pcbios/basemem.c b/src/arch/x86/interface/pcbios/basemem.c
similarity index 100%
rename from src/arch/i386/firmware/pcbios/basemem.c
rename to src/arch/x86/interface/pcbios/basemem.c
diff --git a/src/arch/i386/firmware/pcbios/bios_console.c b/src/arch/x86/interface/pcbios/bios_console.c
similarity index 100%
rename from src/arch/i386/firmware/pcbios/bios_console.c
rename to src/arch/x86/interface/pcbios/bios_console.c
diff --git a/src/arch/i386/interface/pcbios/bios_nap.c b/src/arch/x86/interface/pcbios/bios_nap.c
similarity index 100%
rename from src/arch/i386/interface/pcbios/bios_nap.c
rename to src/arch/x86/interface/pcbios/bios_nap.c
diff --git a/src/arch/i386/interface/pcbios/bios_reboot.c b/src/arch/x86/interface/pcbios/bios_reboot.c
similarity index 100%
rename from src/arch/i386/interface/pcbios/bios_reboot.c
rename to src/arch/x86/interface/pcbios/bios_reboot.c
diff --git a/src/arch/i386/interface/pcbios/bios_smbios.c b/src/arch/x86/interface/pcbios/bios_smbios.c
similarity index 100%
rename from src/arch/i386/interface/pcbios/bios_smbios.c
rename to src/arch/x86/interface/pcbios/bios_smbios.c
diff --git a/src/arch/i386/interface/pcbios/bios_timer.c b/src/arch/x86/interface/pcbios/bios_timer.c
similarity index 100%
rename from src/arch/i386/interface/pcbios/bios_timer.c
rename to src/arch/x86/interface/pcbios/bios_timer.c
diff --git a/src/arch/i386/interface/pcbios/biosint.c b/src/arch/x86/interface/pcbios/biosint.c
similarity index 100%
rename from src/arch/i386/interface/pcbios/biosint.c
rename to src/arch/x86/interface/pcbios/biosint.c
diff --git a/src/arch/i386/firmware/pcbios/e820mangler.S b/src/arch/x86/interface/pcbios/e820mangler.S
similarity index 100%
rename from src/arch/i386/firmware/pcbios/e820mangler.S
rename to src/arch/x86/interface/pcbios/e820mangler.S
diff --git a/src/arch/i386/firmware/pcbios/fakee820.c b/src/arch/x86/interface/pcbios/fakee820.c
similarity index 100%
rename from src/arch/i386/firmware/pcbios/fakee820.c
rename to src/arch/x86/interface/pcbios/fakee820.c
diff --git a/src/arch/i386/firmware/pcbios/hidemem.c b/src/arch/x86/interface/pcbios/hidemem.c
similarity index 100%
rename from src/arch/i386/firmware/pcbios/hidemem.c
rename to src/arch/x86/interface/pcbios/hidemem.c
diff --git a/src/arch/i386/interface/pcbios/int13.c b/src/arch/x86/interface/pcbios/int13.c
similarity index 100%
rename from src/arch/i386/interface/pcbios/int13.c
rename to src/arch/x86/interface/pcbios/int13.c
diff --git a/src/arch/i386/interface/pcbios/int13con.c b/src/arch/x86/interface/pcbios/int13con.c
similarity index 100%
rename from src/arch/i386/interface/pcbios/int13con.c
rename to src/arch/x86/interface/pcbios/int13con.c
diff --git a/src/arch/i386/firmware/pcbios/memmap.c b/src/arch/x86/interface/pcbios/memmap.c
similarity index 100%
rename from src/arch/i386/firmware/pcbios/memmap.c
rename to src/arch/x86/interface/pcbios/memmap.c
diff --git a/src/arch/i386/interface/pcbios/memtop_umalloc.c b/src/arch/x86/interface/pcbios/memtop_umalloc.c
similarity index 100%
rename from src/arch/i386/interface/pcbios/memtop_umalloc.c
rename to src/arch/x86/interface/pcbios/memtop_umalloc.c
diff --git a/src/arch/i386/interface/pcbios/pcibios.c b/src/arch/x86/interface/pcbios/pcibios.c
similarity index 100%
rename from src/arch/i386/interface/pcbios/pcibios.c
rename to src/arch/x86/interface/pcbios/pcibios.c
diff --git a/src/arch/i386/firmware/pcbios/pnpbios.c b/src/arch/x86/interface/pcbios/pnpbios.c
similarity index 100%
rename from src/arch/i386/firmware/pcbios/pnpbios.c
rename to src/arch/x86/interface/pcbios/pnpbios.c
diff --git a/src/arch/i386/interface/pcbios/rtc_entropy.c b/src/arch/x86/interface/pcbios/rtc_entropy.c
similarity index 100%
rename from src/arch/i386/interface/pcbios/rtc_entropy.c
rename to src/arch/x86/interface/pcbios/rtc_entropy.c
diff --git a/src/arch/i386/interface/pcbios/rtc_time.c b/src/arch/x86/interface/pcbios/rtc_time.c
similarity index 100%
rename from src/arch/i386/interface/pcbios/rtc_time.c
rename to src/arch/x86/interface/pcbios/rtc_time.c
diff --git a/src/arch/i386/interface/pcbios/vesafb.c b/src/arch/x86/interface/pcbios/vesafb.c
similarity index 100%
rename from src/arch/i386/interface/pcbios/vesafb.c
rename to src/arch/x86/interface/pcbios/vesafb.c
diff --git a/src/arch/i386/interface/pxe/pxe_call.c b/src/arch/x86/interface/pxe/pxe_call.c
similarity index 100%
rename from src/arch/i386/interface/pxe/pxe_call.c
rename to src/arch/x86/interface/pxe/pxe_call.c
diff --git a/src/arch/i386/interface/pxe/pxe_entry.S b/src/arch/x86/interface/pxe/pxe_entry.S
similarity index 100%
rename from src/arch/i386/interface/pxe/pxe_entry.S
rename to src/arch/x86/interface/pxe/pxe_entry.S
diff --git a/src/arch/i386/interface/pxe/pxe_exit_hook.c b/src/arch/x86/interface/pxe/pxe_exit_hook.c
similarity index 100%
rename from src/arch/i386/interface/pxe/pxe_exit_hook.c
rename to src/arch/x86/interface/pxe/pxe_exit_hook.c
diff --git a/src/arch/i386/interface/pxe/pxe_file.c b/src/arch/x86/interface/pxe/pxe_file.c
similarity index 100%
rename from src/arch/i386/interface/pxe/pxe_file.c
rename to src/arch/x86/interface/pxe/pxe_file.c
diff --git a/src/arch/i386/interface/pxe/pxe_loader.c b/src/arch/x86/interface/pxe/pxe_loader.c
similarity index 100%
rename from src/arch/i386/interface/pxe/pxe_loader.c
rename to src/arch/x86/interface/pxe/pxe_loader.c
diff --git a/src/arch/i386/interface/pxe/pxe_preboot.c b/src/arch/x86/interface/pxe/pxe_preboot.c
similarity index 100%
rename from src/arch/i386/interface/pxe/pxe_preboot.c
rename to src/arch/x86/interface/pxe/pxe_preboot.c
diff --git a/src/arch/i386/interface/pxe/pxe_tftp.c b/src/arch/x86/interface/pxe/pxe_tftp.c
similarity index 100%
rename from src/arch/i386/interface/pxe/pxe_tftp.c
rename to src/arch/x86/interface/pxe/pxe_tftp.c
diff --git a/src/arch/i386/interface/pxe/pxe_udp.c b/src/arch/x86/interface/pxe/pxe_udp.c
similarity index 100%
rename from src/arch/i386/interface/pxe/pxe_udp.c
rename to src/arch/x86/interface/pxe/pxe_udp.c
diff --git a/src/arch/i386/interface/pxe/pxe_undi.c b/src/arch/x86/interface/pxe/pxe_undi.c
similarity index 100%
rename from src/arch/i386/interface/pxe/pxe_undi.c
rename to src/arch/x86/interface/pxe/pxe_undi.c
diff --git a/src/arch/i386/interface/pxeparent/pxeparent.c b/src/arch/x86/interface/pxeparent/pxeparent.c
similarity index 100%
rename from src/arch/i386/interface/pxeparent/pxeparent.c
rename to src/arch/x86/interface/pxeparent/pxeparent.c
diff --git a/src/arch/i386/prefix/bootpart.S b/src/arch/x86/prefix/bootpart.S
similarity index 100%
rename from src/arch/i386/prefix/bootpart.S
rename to src/arch/x86/prefix/bootpart.S
diff --git a/src/arch/i386/prefix/dskprefix.S b/src/arch/x86/prefix/dskprefix.S
similarity index 100%
rename from src/arch/i386/prefix/dskprefix.S
rename to src/arch/x86/prefix/dskprefix.S
diff --git a/src/arch/i386/prefix/exeprefix.S b/src/arch/x86/prefix/exeprefix.S
similarity index 100%
rename from src/arch/i386/prefix/exeprefix.S
rename to src/arch/x86/prefix/exeprefix.S
diff --git a/src/arch/i386/prefix/hdprefix.S b/src/arch/x86/prefix/hdprefix.S
similarity index 100%
rename from src/arch/i386/prefix/hdprefix.S
rename to src/arch/x86/prefix/hdprefix.S
diff --git a/src/arch/i386/prefix/isaromprefix.S b/src/arch/x86/prefix/isaromprefix.S
similarity index 100%
rename from src/arch/i386/prefix/isaromprefix.S
rename to src/arch/x86/prefix/isaromprefix.S
diff --git a/src/arch/i386/prefix/kkkpxeprefix.S b/src/arch/x86/prefix/kkkpxeprefix.S
similarity index 100%
rename from src/arch/i386/prefix/kkkpxeprefix.S
rename to src/arch/x86/prefix/kkkpxeprefix.S
diff --git a/src/arch/i386/prefix/kkpxeprefix.S b/src/arch/x86/prefix/kkpxeprefix.S
similarity index 100%
rename from src/arch/i386/prefix/kkpxeprefix.S
rename to src/arch/x86/prefix/kkpxeprefix.S
diff --git a/src/arch/i386/prefix/kpxeprefix.S b/src/arch/x86/prefix/kpxeprefix.S
similarity index 100%
rename from src/arch/i386/prefix/kpxeprefix.S
rename to src/arch/x86/prefix/kpxeprefix.S
diff --git a/src/arch/i386/prefix/libprefix.S b/src/arch/x86/prefix/libprefix.S
similarity index 100%
rename from src/arch/i386/prefix/libprefix.S
rename to src/arch/x86/prefix/libprefix.S
diff --git a/src/arch/i386/prefix/lkrnprefix.S b/src/arch/x86/prefix/lkrnprefix.S
similarity index 100%
rename from src/arch/i386/prefix/lkrnprefix.S
rename to src/arch/x86/prefix/lkrnprefix.S
diff --git a/src/arch/i386/prefix/mbr.S b/src/arch/x86/prefix/mbr.S
similarity index 100%
rename from src/arch/i386/prefix/mbr.S
rename to src/arch/x86/prefix/mbr.S
diff --git a/src/arch/i386/prefix/mromprefix.S b/src/arch/x86/prefix/mromprefix.S
similarity index 100%
rename from src/arch/i386/prefix/mromprefix.S
rename to src/arch/x86/prefix/mromprefix.S
diff --git a/src/arch/i386/prefix/nbiprefix.S b/src/arch/x86/prefix/nbiprefix.S
similarity index 100%
rename from src/arch/i386/prefix/nbiprefix.S
rename to src/arch/x86/prefix/nbiprefix.S
diff --git a/src/arch/i386/prefix/nullprefix.S b/src/arch/x86/prefix/nullprefix.S
similarity index 100%
rename from src/arch/i386/prefix/nullprefix.S
rename to src/arch/x86/prefix/nullprefix.S
diff --git a/src/arch/i386/prefix/pciromprefix.S b/src/arch/x86/prefix/pciromprefix.S
similarity index 100%
rename from src/arch/i386/prefix/pciromprefix.S
rename to src/arch/x86/prefix/pciromprefix.S
diff --git a/src/arch/i386/prefix/pxeprefix.S b/src/arch/x86/prefix/pxeprefix.S
similarity index 100%
rename from src/arch/i386/prefix/pxeprefix.S
rename to src/arch/x86/prefix/pxeprefix.S
diff --git a/src/arch/i386/prefix/romprefix.S b/src/arch/x86/prefix/romprefix.S
similarity index 100%
rename from src/arch/i386/prefix/romprefix.S
rename to src/arch/x86/prefix/romprefix.S
diff --git a/src/arch/i386/prefix/undiloader.S b/src/arch/x86/prefix/undiloader.S
similarity index 100%
rename from src/arch/i386/prefix/undiloader.S
rename to src/arch/x86/prefix/undiloader.S
diff --git a/src/arch/i386/prefix/unlzma.S b/src/arch/x86/prefix/unlzma.S
similarity index 100%
rename from src/arch/i386/prefix/unlzma.S
rename to src/arch/x86/prefix/unlzma.S
diff --git a/src/arch/i386/prefix/unlzma16.S b/src/arch/x86/prefix/unlzma16.S
similarity index 100%
rename from src/arch/i386/prefix/unlzma16.S
rename to src/arch/x86/prefix/unlzma16.S
diff --git a/src/arch/i386/prefix/usbdisk.S b/src/arch/x86/prefix/usbdisk.S
similarity index 100%
rename from src/arch/i386/prefix/usbdisk.S
rename to src/arch/x86/prefix/usbdisk.S
diff --git a/src/arch/i386/scripts/i386.lds b/src/arch/x86/scripts/pcbios.lds
similarity index 100%
rename from src/arch/i386/scripts/i386.lds
rename to src/arch/x86/scripts/pcbios.lds
diff --git a/src/arch/i386/transitions/liba20.S b/src/arch/x86/transitions/liba20.S
similarity index 100%
rename from src/arch/i386/transitions/liba20.S
rename to src/arch/x86/transitions/liba20.S
diff --git a/src/arch/i386/transitions/libkir.S b/src/arch/x86/transitions/libkir.S
similarity index 100%
rename from src/arch/i386/transitions/libkir.S
rename to src/arch/x86/transitions/libkir.S
diff --git a/src/arch/i386/transitions/libpm.S b/src/arch/x86/transitions/libpm.S
similarity index 100%
rename from src/arch/i386/transitions/libpm.S
rename to src/arch/x86/transitions/libpm.S
diff --git a/src/arch/i386/transitions/librm.S b/src/arch/x86/transitions/librm.S
similarity index 100%
rename from src/arch/i386/transitions/librm.S
rename to src/arch/x86/transitions/librm.S
diff --git a/src/arch/i386/transitions/librm_mgmt.c b/src/arch/x86/transitions/librm_mgmt.c
similarity index 100%
rename from src/arch/i386/transitions/librm_mgmt.c
rename to src/arch/x86/transitions/librm_mgmt.c
diff --git a/src/arch/i386/transitions/librm_test.c b/src/arch/x86/transitions/librm_test.c
similarity index 100%
rename from src/arch/i386/transitions/librm_test.c
rename to src/arch/x86/transitions/librm_test.c
diff --git a/src/arch/x86_64/Makefile.pcbios b/src/arch/x86_64/Makefile.pcbios
new file mode 100644
index 000000000..dfb8db0a0
--- /dev/null
+++ b/src/arch/x86_64/Makefile.pcbios
@@ -0,0 +1,6 @@
+# -*- makefile -*- : Force emacs to use Makefile mode
+
+# Include generic BIOS Makefile
+#
+MAKEDEPS	+= arch/x86/Makefile.pcbios
+include arch/x86/Makefile.pcbios
diff --git a/src/arch/x86_64/include/bits/entropy.h b/src/arch/x86_64/include/bits/entropy.h
deleted file mode 100644
index a9b3bc10e..000000000
--- a/src/arch/x86_64/include/bits/entropy.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef _BITS_ENTROPY_H
-#define _BITS_ENTROPY_H
-
-/** @file
- *
- * x86_64-specific entropy API implementations
- *
- */
-
-FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
-
-#endif /* _BITS_ENTROPY_H */
diff --git a/src/arch/x86_64/include/bits/nap.h b/src/arch/x86_64/include/bits/nap.h
deleted file mode 100644
index 8b42c0a4a..000000000
--- a/src/arch/x86_64/include/bits/nap.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef _BITS_NAP_H
-#define _BITS_NAP_H
-
-/** @file
- *
- * x86_64-specific CPU sleeping API implementations
- *
- */
-
-#include <ipxe/efi/efix86_nap.h>
-
-#endif /* _BITS_MAP_H */
diff --git a/src/arch/x86_64/include/bits/reboot.h b/src/arch/x86_64/include/bits/reboot.h
deleted file mode 100644
index f9bcd6a7b..000000000
--- a/src/arch/x86_64/include/bits/reboot.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef _BITS_REBOOT_H
-#define _BITS_REBOOT_H
-
-/** @file
- *
- * x86_64-specific reboot API implementations
- *
- */
-
-FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
-
-#endif /* _BITS_REBOOT_H */
diff --git a/src/arch/x86_64/include/bits/sanboot.h b/src/arch/x86_64/include/bits/sanboot.h
deleted file mode 100644
index dcab830f6..000000000
--- a/src/arch/x86_64/include/bits/sanboot.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef _BITS_SANBOOT_H
-#define _BITS_SANBOOT_H
-
-/** @file
- *
- * x86_64-specific sanboot API implementations
- *
- */
-
-FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
-
-#endif /* _BITS_SANBOOT_H */
diff --git a/src/arch/x86_64/include/bits/smbios.h b/src/arch/x86_64/include/bits/smbios.h
deleted file mode 100644
index 2f0118d02..000000000
--- a/src/arch/x86_64/include/bits/smbios.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#ifndef _BITS_SMBIOS_H
-#define _BITS_SMBIOS_H
-
-/** @file
- *
- * i386-specific SMBIOS API implementations
- *
- */
-
-#endif /* _BITS_SMBIOS_H */
diff --git a/src/arch/x86_64/include/bits/time.h b/src/arch/x86_64/include/bits/time.h
deleted file mode 100644
index aa74fac8c..000000000
--- a/src/arch/x86_64/include/bits/time.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef _BITS_TIME_H
-#define _BITS_TIME_H
-
-/** @file
- *
- * x86_64-specific time API implementations
- *
- */
-
-FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
-
-#endif /* _BITS_TIME_H */
diff --git a/src/arch/x86_64/include/bits/timer.h b/src/arch/x86_64/include/bits/timer.h
deleted file mode 100644
index dfa6c270c..000000000
--- a/src/arch/x86_64/include/bits/timer.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#ifndef _BITS_TIMER_H
-#define _BITS_TIMER_H
-
-/** @file
- *
- * x86_64-specific timer API implementations
- *
- */
-
-#endif /* _BITS_TIMER_H */
diff --git a/src/arch/x86_64/include/bits/uaccess.h b/src/arch/x86_64/include/bits/uaccess.h
deleted file mode 100644
index 455829242..000000000
--- a/src/arch/x86_64/include/bits/uaccess.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#ifndef _BITS_UACCESS_H
-#define _BITS_UACCESS_H
-
-/** @file
- *
- * x86_64-specific user access API implementations
- *
- */
-
-#endif /* _BITS_UACCESS_H */
diff --git a/src/arch/x86_64/include/bits/umalloc.h b/src/arch/x86_64/include/bits/umalloc.h
deleted file mode 100644
index 12bf949d1..000000000
--- a/src/arch/x86_64/include/bits/umalloc.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#ifndef _BITS_UMALLOC_H
-#define _BITS_UMALLOC_H
-
-/** @file
- *
- * x86_64-specific user memory allocation API implementations
- *
- */
-
-#endif /* _BITS_UMALLOC_H */
diff --git a/src/arch/x86_64/include/pcbios/ipxe/dhcp_arch.h b/src/arch/x86_64/include/pcbios/ipxe/dhcp_arch.h
new file mode 100644
index 000000000..e07e4c192
--- /dev/null
+++ b/src/arch/x86_64/include/pcbios/ipxe/dhcp_arch.h
@@ -0,0 +1,46 @@
+/*
+ * Copyright (C) 2010 VMware, Inc.  All Rights Reserved.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ *
+ * You can also choose to distribute this program under the terms of
+ * the Unmodified Binary Distribution Licence (as given in the file
+ * COPYING.UBDL), provided that you have satisfied its requirements.
+ */
+
+#ifndef _DHCP_ARCH_H
+#define _DHCP_ARCH_H
+
+/** @file
+ *
+ * Architecture-specific DHCP options
+ */
+
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
+
+#include <ipxe/dhcp.h>
+
+#define DHCP_ARCH_VENDOR_CLASS_ID \
+	DHCP_STRING ( 'P', 'X', 'E', 'C', 'l', 'i', 'e', 'n', 't', ':',      \
+		      'A', 'r', 'c', 'h', ':', '0', '0', '0', '0', '0', ':', \
+		      'U', 'N', 'D', 'I', ':', '0', '0', '2', '0', '0', '1' )
+
+#define DHCP_ARCH_CLIENT_ARCHITECTURE \
+	DHCP_WORD ( DHCP_CLIENT_ARCHITECTURE_X86 )
+
+#define DHCP_ARCH_CLIENT_NDI DHCP_OPTION ( 1 /* UNDI */ , 2, 1 /* v2.1 */ )
+
+#endif