diff --git a/CHANGES b/CHANGES
index 112b9917..07c95182 100644
--- a/CHANGES
+++ b/CHANGES
@@ -20,12 +20,16 @@ ask CVS about it:
 2.8.0 (2003????)
   NOTE: Requires i2c-2.8.0 or newer.
   Dropped all kernel 2.2 and 2.3 compatibility; 2.4.9 or later required
+  File i2c-dev.h: Include userspace portion removed from i2c-dev.h in
+                  i2c package
   File sensors.conf.eg: Fix vt1211/vt8231 thermistor calculations
   Library: Add support for exponents and logarithms for vt1211/vt8235 temps;
-           add lm85 support
+           add lm85 support; add w83791d support
   Makefiles: Generate warnings if new library won't be found by ld.so;
              Modules now install in kernel/drivers/i2c/[busses,chips];
-             Ensure that headers in /usr/local/include are used first
+             Ensure that headers in /usr/local/include are used first;
+             Don't use /usr/include headers for modules;
+             Handle multiple UTS_RELEASE definitions in linux/version.h
   Modules (all): Cleanups including
 		- Add #include <i2c-proc.h>
 		- C99 initializers
@@ -57,10 +61,12 @@ ask CVS about it:
           pwm and pwm enable support; update docs
   Module w83627hf: New
   Program decode-dimms.pl: Recognize DDR and Rambus
+  Program eeprom: Fix writes for small eeproms
+  Program eeprom, eepromer: Use local i2c-dev.h for build
   Program lm_sensors.init: Call sensors -s in start()
   Program mkpatch: Fix vt8231 compile; keep tsunami from menu on non-alpha
   Program pwmtest: New
-  Program sensors: add lm85 support
+  Program sensors: add lm85 support; add w83791d support
   Program sensors-detect: Add super i/o detection (smsc47m1, vt1211,
                           w83627hf, w83697hf)
 
diff --git a/Makefile b/Makefile
index 03b7a639..b30875d3 100644
--- a/Makefile
+++ b/Makefile
@@ -90,7 +90,7 @@ PREFIX := /usr/local
 #MODDIR := /lib/modules/`grep UTS_RELEASE $(LINUX_HEADERS)/linux/version.h|cut -f 2 -d'"'`/misc
 #MODPREF := /lib/modules/$(KERNELVERSION)
 #MODPREF := /lib/modules/`grep UTS_RELEASE $(LINUX_HEADERS)/linux/version.h|cut -f 2 -d'"'`
-MODPREF := /lib/modules/`$(CC) -I$(LINUX_HEADERS) -E etc/config.c | grep uts_release |cut -f 2 -d'"'`
+MODPREF := /lib/modules/$(shell $(CC) -I$(LINUX_HEADERS) -E etc/config.c | grep uts_release |cut -f 2 -d'"')
 
 # This is the directory where sensors.conf will be installed, if no other
 # configuration file is found
@@ -179,7 +179,6 @@ GREP := grep
 # PROGCPPFLAGS/PROGCFLAGS is to create non-kernel object files (which are linked into executables).
 # ARCPPFLAGS/ARCFLAGS are used to create archive object files (static libraries).
 # LIBCPPFLAGS/LIBCFLAGS are for shared library objects.
-#ALL_CPPFLAGS := -I. -Ikernel/include -I$(I2C_HEADERS) -idirafter $(LINUX_HEADERS)
 ALL_CPPFLAGS := -I. -Ikernel/include -I$(I2C_HEADERS) -I$(LINUX_HEADERS)
 ALL_CFLAGS := -O2 
 
@@ -215,7 +214,12 @@ ifeq ($(MODVER),1)
 MODCPPFLAGS += -DMODVERSIONS -include $(LINUX_HEADERS)/linux/modversions.h
 endif
 
-MODCPPFLAGS += -D__KERNEL__ -DMODULE -DEXPORT_SYMTAB -fomit-frame-pointer $(ALL_CPPFLAGS)
+# This magic is from the kernel Makefile.
+# Extra cflags for kbuild 2.4.  The default is to forbid includes by kernel code
+# from user space headers.
+kbuild_2_4_nostdinc := -nostdinc $(shell $(CC) -print-search-dirs | sed -ne 's/install: \(.*\)/-I \1include/gp')
+
+MODCPPFLAGS += -D__KERNEL__ -DMODULE -DEXPORT_SYMTAB -fomit-frame-pointer $(ALL_CPPFLAGS) $(kbuild_2_4_nostdinc)
 MODCFLAGS += $(ALL_CFLAGS)
 PROGCPPFLAGS := $(ALL_CPPFLAGS)
 PROGCFLAGS := $(ALL_CFLAGS)