diff --git a/Makefile b/Makefile
index 1130681..ac2342f 100644
--- a/Makefile
+++ b/Makefile
@@ -33,18 +33,26 @@ OBJS	+= bios/bios.o
 
 LIBS	+= -lrt
 
+# Additional ARCH settings for x86
+ARCH ?= $(shell echo $(uname_M) | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ \
+                  -e s/arm.*/arm/ -e s/sa110/arm/ \
+                  -e s/s390x/s390/ -e s/parisc64/parisc/ \
+                  -e s/ppc.*/powerpc/ -e s/mips.*/mips/ \
+                  -e s/sh[234].*/sh/ )
+
 uname_M      := $(shell uname -m | sed -e s/i.86/i386/)
 ifeq ($(uname_M),i386)
 	DEFINES      += -DCONFIG_X86_32
 endif
 ifeq ($(uname_M),x86_64)
+	ARCH         := x86
 	DEFINES      += -DCONFIG_X86_64
 endif
 
 DEFINES	+= -D_FILE_OFFSET_BITS=64
 DEFINES	+= -D_GNU_SOURCE
 
-CFLAGS	+= $(CPPFLAGS) $(DEFINES) -Iinclude -I../../include -Os -g
+CFLAGS	+= $(CPPFLAGS) $(DEFINES) -Iinclude -I../../include -I../../arch/$(ARCH)/include/  -Os -g
 
 WARNINGS += -Werror
 WARNINGS += -Wall