diff --git a/CHANGES b/CHANGES
index 616056d1..8c3deda5 100644
--- a/CHANGES
+++ b/CHANGES
@@ -17,11 +17,12 @@ ask CVS about it:
 
 -----------------------------------------------------------------------------
 
-2.7.1 (2003????)
+2.8.0 (2003????)
   NOTE: Requires i2c-2.7.0 or newer.
   File sensors.conf.eg: Fix vt1211/vt8231 thermistor calculations
   Library: Add support for exponents and logarithms for vt1211/vt8235 temps
-  Makefile: Generate warnings if new library won't be found by ld.so
+  Makefiles: Generate warnings if new library won't be found by ld.so;
+             Modules now install in kernel/drivers/i2c/[busses,chips]
   Module adm1021: Ignore failed reads and report old value
   Modules ddcmon, eeprom: Use i2c block reads if possible
   Module i2c-i810.c: Fix for some chips
diff --git a/kernel/busses/Module.mk b/kernel/busses/Module.mk
index 18b8c7e6..cf1f5c0c 100644
--- a/kernel/busses/Module.mk
+++ b/kernel/busses/Module.mk
@@ -98,16 +98,16 @@ all :: all-kernel-busses
 
 #
 # If $MODPREF/kernel exists, we presume the new (2.4.0) /lib/modules/x.y.z directory
-# layout, so we install in kernel/drivers/i2c/ and remove old versions in misc/
-# Otherwise we install in misc/ as before.
+# layout, so we install in kernel/drivers/i2c/busses and remove old versions in misc/
+# and kernel/drivers/i2c/ . Otherwise we install in misc/ as before.
 #
 install-kernel-busses: all-kernel-busses
 	if [ -n "$(KERNELBUSSESTARGETS)" ] ; then \
 	  if [ -d "$(DESTDIR)$(MODPREF)/kernel" ] ; then \
-	    $(MKDIR) $(DESTDIR)$(MODPREF)/kernel/drivers/i2c ; \
-	    $(INSTALL) -o root -g root -m 644 $(KERNELBUSSESTARGETS) $(DESTDIR)$(MODPREF)/kernel/drivers/i2c ; \
+	    $(MKDIR) $(DESTDIR)$(MODPREF)/kernel/drivers/i2c/busses ; \
+	    $(INSTALL) -o root -g root -m 644 $(KERNELBUSSESTARGETS) $(DESTDIR)$(MODPREF)/kernel/drivers/i2c/busses ; \
 	    for i in $(KERNELBUSSESTARGETS) ; do \
-	      $(RM) $(DESTDIR)$(MODPREF)/misc/`basename $$i` ; \
+	      $(RM) $(DESTDIR)$(MODPREF)/misc/`basename $$i` $(DESTDIR)$(MODPREF)/kernel/drivers/i2c/`basename $$i` ; \
 	    done \
 	  else \
 	    $(MKDIR) $(DESTDIR)$(MODPREF)/misc ; \
diff --git a/kernel/chips/Module.mk b/kernel/chips/Module.mk
index 1e4a07d0..07c1c35f 100644
--- a/kernel/chips/Module.mk
+++ b/kernel/chips/Module.mk
@@ -135,16 +135,16 @@ all :: all-kernel-chips
 
 #
 # If $MODPREF/kernel exists, we presume the new (2.4.0) /lib/modules/x.y.z directory
-# layout, so we install in kernel/drivers/sensors/ and remove old versions in misc/
-# Otherwise we install in misc/ as before.
+# layout, so we install in kernel/drivers/i2c/chips/ and remove old versions in misc/
+# and kernel/drivers/sensors/ . Otherwise we install in misc/ as before.
 #
 install-kernel-chips: all-kernel-chips
 	if [ -n "$(KERNELCHIPSTARGETS)" ] ; then \
 	  if [ -d "$(DESTDIR)$(MODPREF)/kernel" ] ; then \
-	    $(MKDIR) $(DESTDIR)$(MODPREF)/kernel/drivers/sensors ; \
-	    $(INSTALL) -o root -g root -m 644 $(KERNELCHIPSTARGETS) $(DESTDIR)$(MODPREF)/kernel/drivers/sensors ; \
+	    $(MKDIR) $(DESTDIR)$(MODPREF)/kernel/drivers/i2c/chips ; \
+	    $(INSTALL) -o root -g root -m 644 $(KERNELCHIPSTARGETS) $(DESTDIR)$(MODPREF)/kernel/drivers/i2c/chips ; \
 	    for i in $(KERNELCHIPSTARGETS) ; do \
-	      $(RM) $(DESTDIR)$(MODPREF)/misc/`basename $$i` ; \
+	      $(RM) $(DESTDIR)$(MODPREF)/misc/`basename $$i` $(DESTDIR)$(MODPREF)/kernel/drivers/sensors/`basename $$i` ; \
 	    done \
 	  else \
 	    $(MKDIR) $(DESTDIR)$(MODPREF)/misc ; \