diff --git a/src/arch/i386/Makefile b/src/arch/i386/Makefile
index 7f706a5a..478e0634 100644
--- a/src/arch/i386/Makefile
+++ b/src/arch/i386/Makefile
@@ -115,7 +115,6 @@ SRCDIRS		+= arch/i386/interface/pcbios
 SRCDIRS		+= arch/i386/interface/pxe
 SRCDIRS		+= arch/i386/interface/pxeparent
 SRCDIRS 	+= arch/i386/interface/syslinux
-SRCDIRS		+= arch/i386/interface/vmware
 SRCDIRS		+= arch/i386/hci/commands
 
 # Include common x86 Makefile
diff --git a/src/arch/x86/Makefile b/src/arch/x86/Makefile
index 98c49b98..4ab741db 100644
--- a/src/arch/x86/Makefile
+++ b/src/arch/x86/Makefile
@@ -6,6 +6,7 @@ INCDIRS		+= arch/x86/include
 #
 SRCDIRS		+= arch/x86/core
 SRCDIRS		+= arch/x86/interface/efi
+SRCDIRS		+= arch/x86/interface/vmware
 SRCDIRS		+= arch/x86/prefix
 SRCDIRS		+= arch/x86/hci/commands
 SRCDIRS		+= arch/x86/drivers/xen
diff --git a/src/arch/i386/include/ipxe/guestrpc.h b/src/arch/x86/include/ipxe/guestrpc.h
similarity index 100%
rename from src/arch/i386/include/ipxe/guestrpc.h
rename to src/arch/x86/include/ipxe/guestrpc.h
diff --git a/src/arch/i386/include/ipxe/vmware.h b/src/arch/x86/include/ipxe/vmware.h
similarity index 100%
rename from src/arch/i386/include/ipxe/vmware.h
rename to src/arch/x86/include/ipxe/vmware.h
diff --git a/src/arch/i386/interface/vmware/guestinfo.c b/src/arch/x86/interface/vmware/guestinfo.c
similarity index 100%
rename from src/arch/i386/interface/vmware/guestinfo.c
rename to src/arch/x86/interface/vmware/guestinfo.c
diff --git a/src/arch/i386/interface/vmware/guestrpc.c b/src/arch/x86/interface/vmware/guestrpc.c
similarity index 100%
rename from src/arch/i386/interface/vmware/guestrpc.c
rename to src/arch/x86/interface/vmware/guestrpc.c
diff --git a/src/arch/i386/interface/vmware/vmconsole.c b/src/arch/x86/interface/vmware/vmconsole.c
similarity index 100%
rename from src/arch/i386/interface/vmware/vmconsole.c
rename to src/arch/x86/interface/vmware/vmconsole.c
diff --git a/src/arch/i386/interface/vmware/vmware.c b/src/arch/x86/interface/vmware/vmware.c
similarity index 100%
rename from src/arch/i386/interface/vmware/vmware.c
rename to src/arch/x86/interface/vmware/vmware.c