diff --git a/config.mk b/config.mk
index a9973a4..fd56621 100644
--- a/config.mk
+++ b/config.mk
@@ -83,7 +83,7 @@ RANLIB	= $(CROSS_COMPILE)RANLIB
 sinclude $(OBJTREE)/include/autoconf.mk
 
 ifdef	ARCH
-sinclude $(TOPDIR)/$(ARCH)_config.mk	# include architecture dependend rules
+sinclude $(TOPDIR)/lib_$(ARCH)/config.mk	# include architecture dependend rules
 endif
 ifdef	CPU
 sinclude $(TOPDIR)/cpu/$(CPU)/config.mk	# include  CPU	specific rules
diff --git a/arm_config.mk b/lib_arm/config.mk
similarity index 100%
rename from arm_config.mk
rename to lib_arm/config.mk
diff --git a/avr32_config.mk b/lib_avr32/config.mk
similarity index 100%
rename from avr32_config.mk
rename to lib_avr32/config.mk
diff --git a/blackfin_config.mk b/lib_blackfin/config.mk
similarity index 100%
rename from blackfin_config.mk
rename to lib_blackfin/config.mk
diff --git a/i386_config.mk b/lib_i386/config.mk
similarity index 100%
rename from i386_config.mk
rename to lib_i386/config.mk
diff --git a/m68k_config.mk b/lib_m68k/config.mk
similarity index 100%
rename from m68k_config.mk
rename to lib_m68k/config.mk
diff --git a/microblaze_config.mk b/lib_microblaze/config.mk
similarity index 100%
rename from microblaze_config.mk
rename to lib_microblaze/config.mk
diff --git a/mips_config.mk b/lib_mips/config.mk
similarity index 100%
rename from mips_config.mk
rename to lib_mips/config.mk
diff --git a/nios_config.mk b/lib_nios/config.mk
similarity index 100%
rename from nios_config.mk
rename to lib_nios/config.mk
diff --git a/nios2_config.mk b/lib_nios2/config.mk
similarity index 100%
rename from nios2_config.mk
rename to lib_nios2/config.mk
diff --git a/ppc_config.mk b/lib_ppc/config.mk
similarity index 100%
rename from ppc_config.mk
rename to lib_ppc/config.mk
diff --git a/sh_config.mk b/lib_sh/config.mk
similarity index 100%
rename from sh_config.mk
rename to lib_sh/config.mk
diff --git a/sparc_config.mk b/lib_sparc/config.mk
similarity index 100%
rename from sparc_config.mk
rename to lib_sparc/config.mk