diff --git a/generate/linux/Makefile.acpibin b/generate/linux/Makefile.acpibin
index 41a13febc..c7707eec3 100644
--- a/generate/linux/Makefile.acpibin
+++ b/generate/linux/Makefile.acpibin
@@ -16,7 +16,7 @@ CFLAGS+= -Wall -O2 -D_LINUX -DACPI_APPLICATION -Wstrict-prototypes -I../../inclu
 
 
 acpibin : $(patsubst %.c,%.o, $(SRCS))
-	$(CC) $(LDFLAGS) $(patsubst %.c,%.o, $(SRCS)) -o $(PROG)
+	$(CC) $(LDFLAGS) $(CFLAGS) $(patsubst %.c,%.o, $(SRCS)) -o $(PROG)
 
 CLEANFILES= $(PROG)
 
diff --git a/generate/linux/Makefile.acpiexec b/generate/linux/Makefile.acpiexec
index b9e892aa7..31f2338c5 100644
--- a/generate/linux/Makefile.acpiexec
+++ b/generate/linux/Makefile.acpiexec
@@ -4,9 +4,9 @@
 
 PROG = acpiexec
 
-ACPICA_SRC =    ../../../source
+ACPICA_SRC =    ../..
 ACPICA_COMMON = $(ACPICA_SRC)/common
-ACPICA_CORE =   $(ACPICA_SRC)/components
+ACPICA_CORE =   $(ACPICA_SRC)
 ACPICA_TOOLS =  $(ACPICA_SRC)/tools
 ACPICA_OSL =    $(ACPICA_SRC)/os_specific/service_layers
 
diff --git a/generate/linux/Makefile.acpisrc b/generate/linux/Makefile.acpisrc
index 96816ce12..216c51a68 100644
--- a/generate/linux/Makefile.acpisrc
+++ b/generate/linux/Makefile.acpisrc
@@ -8,7 +8,7 @@ CFLAGS+= -Wall -O2 -D_LINUX -DACPI_APPLICATION -Wstrict-prototypes -I../../inclu
 
 
 aslmain : $(patsubst %.c,%.o, $(SRCS))
-	$(CC) $(LDFLAGS) $(patsubst %.c,%.o, $(SRCS)) -o $(PROG)
+	$(CC) $(LDFLAGS) $(CFLAGS) $(patsubst %.c,%.o, $(SRCS)) -o $(PROG)
 
 CLEANFILES= $(PROG)
 
diff --git a/generate/linux/Makefile.acpixtract b/generate/linux/Makefile.acpixtract
index be7a73585..3dd15233f 100644
--- a/generate/linux/Makefile.acpixtract
+++ b/generate/linux/Makefile.acpixtract
@@ -7,7 +7,7 @@ CFLAGS+= -Wall -O2 -D_LINUX -DACPI_APPLICATION -Wstrict-prototypes -I../../inclu
 
 
 acpixtract : $(patsubst %.c,%.o, $(SRCS))
-	$(CC) $(LDFLAGS) $(patsubst %.c,%.o, $(SRCS)) -o $(PROG)
+	$(CC) $(LDFLAGS) $(CFLAGS) $(patsubst %.c,%.o, $(SRCS)) -o $(PROG)
 
 CLEANFILES= $(PROG)
 
diff --git a/generate/linux/Makefile.iasl b/generate/linux/Makefile.iasl
index 962ab6702..f1f175c50 100644
--- a/generate/linux/Makefile.iasl
+++ b/generate/linux/Makefile.iasl
@@ -7,7 +7,7 @@ PROG=	iasl
 ACPICA_SRC =    ..
 ASL_COMPILER =  $(ACPICA_SRC)/compiler
 ACPICA_COMMON = $(ACPICA_SRC)/common
-ACPICA_CORE =   $(ACPICA_SRC)/components
+ACPICA_CORE =   $(ACPICA_SRC)
 ACPICA_TOOLS =  $(ACPICA_SRC)/tools
 ACPICA_OSL =    $(ACPICA_SRC)/os_specific/service_layers
 
@@ -166,7 +166,7 @@ MISC = \
 # Root rule
 #
 $(PROG) : $(INTERMEDIATES) $(OBJS)
-	$(CC) $(LDFLAGS) $(OBJS) -o $(PROG)
+	$(CC) $(OBJS) $(LDFLAGS) -o $(PROG)
 	$(COPYPROG)