diff --git a/arch/i386/Makefile b/arch/i386/Makefile
index 87c959d5f354..191e171b3672 100644
--- a/arch/i386/Makefile
+++ b/arch/i386/Makefile
@@ -69,7 +69,7 @@ mcore-$(CONFIG_X86_VOYAGER)	:= arch/i386/mach-voyager
 
 # VISWS subarch support
 mflags-$(CONFIG_X86_VISWS)	:= -Iinclude/asm-i386/mach-visws
-mcore-$(CONFIG_X86_VISWS)	:= arch/i386/mach-visws
+mcore-$(CONFIG_X86_VISWS)	:= arch/x86/mach-visws
 
 # NUMAQ subarch support
 mflags-$(CONFIG_X86_NUMAQ)	:= -Iinclude/asm-i386/mach-numaq
diff --git a/arch/i386/mach-visws/Makefile b/arch/x86/mach-visws/Makefile
similarity index 100%
rename from arch/i386/mach-visws/Makefile
rename to arch/x86/mach-visws/Makefile
diff --git a/arch/i386/mach-visws/mpparse.c b/arch/x86/mach-visws/mpparse.c
similarity index 100%
rename from arch/i386/mach-visws/mpparse.c
rename to arch/x86/mach-visws/mpparse.c
diff --git a/arch/i386/mach-visws/reboot.c b/arch/x86/mach-visws/reboot.c
similarity index 100%
rename from arch/i386/mach-visws/reboot.c
rename to arch/x86/mach-visws/reboot.c
diff --git a/arch/i386/mach-visws/setup.c b/arch/x86/mach-visws/setup.c
similarity index 100%
rename from arch/i386/mach-visws/setup.c
rename to arch/x86/mach-visws/setup.c
diff --git a/arch/i386/mach-visws/traps.c b/arch/x86/mach-visws/traps.c
similarity index 100%
rename from arch/i386/mach-visws/traps.c
rename to arch/x86/mach-visws/traps.c
diff --git a/arch/i386/mach-visws/visws_apic.c b/arch/x86/mach-visws/visws_apic.c
similarity index 100%
rename from arch/i386/mach-visws/visws_apic.c
rename to arch/x86/mach-visws/visws_apic.c