Index: Makefile
===================================================================
--- Makefile	(revision f4338d2fac6a4e6b6236f00ee0b78b29bc920b0a)
+++ Makefile	(revision 36e7b6c324186726ec258e6d341ad12966be7c96)
@@ -37,10 +37,8 @@
 RELEASE = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
 
-## Make some default assumptions
+## Include configuration
 #
 
-ifndef ARCH
-	ARCH = ia32
-endif
+include Makefile.config
 
 ## Common compiler flags
@@ -59,5 +57,4 @@
 #
 
-include Makefile.config
 include arch/$(ARCH)/Makefile.inc
 include genarch/Makefile.inc