diff --git a/arch/i386/Makefile b/arch/i386/Makefile
index 93492b37061c8242ed24c70896127e2e33aaa032..da64799484a779df277fdc136a0c31f81bb46bd0 100644
--- a/arch/i386/Makefile
+++ b/arch/i386/Makefile
@@ -110,7 +110,7 @@ drivers-$(CONFIG_MATH_EMULATION)	+= arch/x86/math-emu/
 drivers-$(CONFIG_PCI)			+= arch/i386/pci/
 # must be linked after kernel/
 drivers-$(CONFIG_OPROFILE)		+= arch/i386/oprofile/
-drivers-$(CONFIG_PM)			+= arch/i386/power/
+drivers-$(CONFIG_PM)			+= arch/x86/power/
 drivers-$(CONFIG_FB)                    += arch/i386/video/
 
 CFLAGS += $(mflags-y)
diff --git a/arch/i386/power/Makefile b/arch/x86/power/Makefile
similarity index 100%
rename from arch/i386/power/Makefile
rename to arch/x86/power/Makefile
diff --git a/arch/i386/power/cpu.c b/arch/x86/power/cpu.c
similarity index 100%
rename from arch/i386/power/cpu.c
rename to arch/x86/power/cpu.c
diff --git a/arch/i386/power/suspend.c b/arch/x86/power/suspend.c
similarity index 100%
rename from arch/i386/power/suspend.c
rename to arch/x86/power/suspend.c
diff --git a/arch/i386/power/swsusp.S b/arch/x86/power/swsusp.S
similarity index 100%
rename from arch/i386/power/swsusp.S
rename to arch/x86/power/swsusp.S