diff --git a/arch/i386/Makefile b/arch/i386/Makefile
index fc85d6674fcb9e8480e1fabd612c05a32c264416..e03c47e56c76025408b6eca9e1bbf858ce6e3032 100644
--- a/arch/i386/Makefile
+++ b/arch/i386/Makefile
@@ -65,7 +65,7 @@ mcore-y  := arch/x86/mach-default
 
 # Voyager subarch support
 mflags-$(CONFIG_X86_VOYAGER)	:= -Iinclude/asm-i386/mach-voyager
-mcore-$(CONFIG_X86_VOYAGER)	:= arch/i386/mach-voyager
+mcore-$(CONFIG_X86_VOYAGER)	:= arch/x86/mach-voyager
 
 # VISWS subarch support
 mflags-$(CONFIG_X86_VISWS)	:= -Iinclude/asm-i386/mach-visws
diff --git a/arch/i386/mach-voyager/Makefile b/arch/x86/mach-voyager/Makefile
similarity index 100%
rename from arch/i386/mach-voyager/Makefile
rename to arch/x86/mach-voyager/Makefile
diff --git a/arch/i386/mach-voyager/setup.c b/arch/x86/mach-voyager/setup.c
similarity index 100%
rename from arch/i386/mach-voyager/setup.c
rename to arch/x86/mach-voyager/setup.c
diff --git a/arch/i386/mach-voyager/voyager_basic.c b/arch/x86/mach-voyager/voyager_basic.c
similarity index 100%
rename from arch/i386/mach-voyager/voyager_basic.c
rename to arch/x86/mach-voyager/voyager_basic.c
diff --git a/arch/i386/mach-voyager/voyager_cat.c b/arch/x86/mach-voyager/voyager_cat.c
similarity index 100%
rename from arch/i386/mach-voyager/voyager_cat.c
rename to arch/x86/mach-voyager/voyager_cat.c
diff --git a/arch/i386/mach-voyager/voyager_smp.c b/arch/x86/mach-voyager/voyager_smp.c
similarity index 100%
rename from arch/i386/mach-voyager/voyager_smp.c
rename to arch/x86/mach-voyager/voyager_smp.c
diff --git a/arch/i386/mach-voyager/voyager_thread.c b/arch/x86/mach-voyager/voyager_thread.c
similarity index 100%
rename from arch/i386/mach-voyager/voyager_thread.c
rename to arch/x86/mach-voyager/voyager_thread.c