diff --git a/Makefile b/Makefile
index 90171d38..9ed3852a 100644
--- a/Makefile
+++ b/Makefile
@@ -150,8 +150,14 @@ MACHINE := $(shell uname -m)
 # to do this. 
 
 # The subdirectories we need to build things in 
-SRCDIRS := mkpatch
-SRCDIRS += kernel kernel/busses kernel/chips kernel/include
+SRCDIRS :=
+ifneq ($(MAKECMDGOALS),user)
+ifneq ($(MAKECMDGOALS),user_install)
+SRCDIRS += mkpatch
+SRCDIRS += kernel kernel/busses kernel/chips
+endif
+endif
+SRCDIRS += kernel/include
 SRCDIRS += lib prog/detect prog/dump prog/eeprom prog/pwm \
            prog/sensors prog/xeon ${PROG_EXTRA:%=prog/%} etc
 
@@ -164,7 +170,7 @@ BISON := bison
 FLEX := flex
 AR := ar
 INSTALL := install
-LN := ln -sfn
+LN := ln -sf
 GREP := grep
 AWK := awk
 SED := sed
diff --git a/kernel/include/Module.mk b/kernel/include/Module.mk
index 277c19fe..f5984890 100644
--- a/kernel/include/Module.mk
+++ b/kernel/include/Module.mk
@@ -20,6 +20,7 @@
 # verbatim in the rules, until it is redefined. 
 MODULE_DIR := kernel/include
 KERNELINCLUDEDIR := $(MODULE_DIR)
+KERNELCHIPSDIR := kernel/chips
 
 KERNELINCLUDEFILES := $(MODULE_DIR)/i2c-dev.h $(MODULE_DIR)/sensors.h