diff --git a/[refs] b/[refs]
index 978b67f9c4da..b0939fd00644 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9702785a747aa27baf46ff504beab6528f21f2dd
+refs/heads/master: 9402e12b8fef1efe9cf949fc020dcda22d9d8667
diff --git a/trunk/arch/i386/Makefile b/trunk/arch/i386/Makefile
index fc85d6674fcb..e03c47e56c76 100644
--- a/trunk/arch/i386/Makefile
+++ b/trunk/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/trunk/arch/i386/mach-voyager/Makefile b/trunk/arch/x86/mach-voyager/Makefile
similarity index 100%
rename from trunk/arch/i386/mach-voyager/Makefile
rename to trunk/arch/x86/mach-voyager/Makefile
diff --git a/trunk/arch/i386/mach-voyager/setup.c b/trunk/arch/x86/mach-voyager/setup.c
similarity index 100%
rename from trunk/arch/i386/mach-voyager/setup.c
rename to trunk/arch/x86/mach-voyager/setup.c
diff --git a/trunk/arch/i386/mach-voyager/voyager_basic.c b/trunk/arch/x86/mach-voyager/voyager_basic.c
similarity index 100%
rename from trunk/arch/i386/mach-voyager/voyager_basic.c
rename to trunk/arch/x86/mach-voyager/voyager_basic.c
diff --git a/trunk/arch/i386/mach-voyager/voyager_cat.c b/trunk/arch/x86/mach-voyager/voyager_cat.c
similarity index 100%
rename from trunk/arch/i386/mach-voyager/voyager_cat.c
rename to trunk/arch/x86/mach-voyager/voyager_cat.c
diff --git a/trunk/arch/i386/mach-voyager/voyager_smp.c b/trunk/arch/x86/mach-voyager/voyager_smp.c
similarity index 100%
rename from trunk/arch/i386/mach-voyager/voyager_smp.c
rename to trunk/arch/x86/mach-voyager/voyager_smp.c
diff --git a/trunk/arch/i386/mach-voyager/voyager_thread.c b/trunk/arch/x86/mach-voyager/voyager_thread.c
similarity index 100%
rename from trunk/arch/i386/mach-voyager/voyager_thread.c
rename to trunk/arch/x86/mach-voyager/voyager_thread.c