diff --git a/src/Makefile b/src/Makefile
index 2b7f772fb2..66e823d7a9 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -258,7 +258,7 @@ AFLAGS	=
 # Use LINUXBIOSINCLUDE when you must reference the include/ directory.
 # Needed to be compatible with the O= option
 LINUXBIOSINCLUDE    := -Iinclude \
-                   -I$(srctree)/include) \
+                   -I$(srctree)/include \
 		   -include include/linuxbios/autoconf.h
 
 CPPFLAGS        := $(LINUXBIOSINCLUDE)
@@ -438,7 +438,7 @@ CFLAGS += $(call cc-option,-Wno-pointer-sign,)
 export LBBUILD_IMAGE ?= linuxbios.rom startup_code.rom 
 
 
-core-y := mainboard/
+core-y := mainboard/$(MAINBOARD)/
 ifeq ($(LBBUILD_COMPRESSORS),)
 core-y		+=  compressors
 
diff --git a/src/mainboard/emulation/qemu-i386/Makefile b/src/mainboard/emulation/qemu-i386/Makefile
index 1d61afce50..e0cdb5c757 100644
--- a/src/mainboard/emulation/qemu-i386/Makefile
+++ b/src/mainboard/emulation/qemu-i386/Makefile
@@ -1,5 +1,5 @@
 #
-# Makefile for the linux kernel.
+# Makefile for this mainboard
 #
 
 obj-y     = mainboard.o irq_tables.o setup_before_car.o
diff --git a/src/scripts/Makefile.build b/src/scripts/Makefile.build
index cec2156652..3c6ff2e07a 100644
--- a/src/scripts/Makefile.build
+++ b/src/scripts/Makefile.build
@@ -30,7 +30,7 @@ ifneq ($(hostprogs-y)$(hostprogs-m),)
 include scripts/Makefile.host
 endif
 
-ifneq ($(LBBIOSBUILD_SRC),)
+ifneq ($(LBBUILD_SRC),)
 # Create output directory if not already present
 _dummy := $(shell [ -d $(obj) ] || mkdir -p $(obj))
 
@@ -60,8 +60,8 @@ __build: $(builtin-target) $(lib-target) $(extra-y) \
 
 
 # Linus' kernel sanity checking tool
-ifneq ($(LBBIOSBUILD_CHECKSRC),0)
-  ifeq ($(LBBIOSBUILD_CHECKSRC),2)
+ifneq ($(LBBUILD_CHECKSRC),0)
+  ifeq ($(LBBUILD_CHECKSRC),2)
     quiet_cmd_force_checksrc = CHECK   $<
           cmd_force_checksrc = $(CHECK) $(CHECKFLAGS) $(c_flags) $< ;
   else