diff --git a/README b/README
index 437dd784..da13418d 100644
--- a/README
+++ b/README
@@ -7,6 +7,10 @@ WARNING! If you downloaded this package through our CVS archive, you walk
 the cutting edge. Things may not even compile! On the other hand, you will
 be the first to profit from new drivers and other changes. Have fun!
 
+WARNING! Some things have changed since version 2.1.2. Most notably,
+module piix4 is renamed i2c-piix4, module isa is renamed i2c-isa,
+and module bit-mb is renamed i2c-via. You have been warned.
+
 At least the following SMBus adapters are supported:
   Intel PIIX4 (used in most Intel chipsets)
   Acer Labs M1541 and M1543C (used in the Aladdin IV, V and Pro 2 chipsets)
diff --git a/TODO b/TODO
index 66c21308..8444973a 100644
--- a/TODO
+++ b/TODO
@@ -4,8 +4,8 @@ Many, many things. Most notably:
 * Create wait-queues for bus locking instead of pure semaphores, to make
   it more interactive
 * Check for block read/writes in smbus-on-i2c emulation code
-* Merge man-pages
-* Fans give overflow if small values are written to them.
+* Fans give overflow if small values are written to them in /proc; other 
+  features may too.
 * At least the bit-lp and bit-velle modules do no detection on loading;
   ask Simon whether this is possible to add.
 * kmalloc with GFP_KERNEL can cause a context switch! Check whether this is
@@ -37,5 +37,5 @@ Many, many things. Most notably:
 * Some library routines are pretty inefficient right now
 * Test SIS5595(/91/98) sensor support. Write generic i2c support. 
   Thomas Dickel <Thomas.Dickel@mni.fh-giessen.de> owns one SIS5595.
-* Write Acer Labs Aladdin V southbridge (M1543C) support
-  Mark Studebaker <mds@blazer.eng.paradyne.com> is working on it.
+  The sensor data must be added to lib/chips
+* Extend detect script to detect chips too.
diff --git a/kernel/chips/lm78.c b/kernel/chips/lm78.c
index 5d4faff3..b90b2267 100644
--- a/kernel/chips/lm78.c
+++ b/kernel/chips/lm78.c
@@ -317,11 +317,6 @@ int lm78_detect_isa(struct isa_adapter *adapter)
     if (check_region(address, LM78_EXTENT))
       continue;
 
-    /* Awful, but true: unused port addresses should return 0xff */
-    if ((inb_p(address + 1) != 0xff) || (inb_p(address + 2) != 0xff) ||
-       (inb_p(address + 3) != 0xff) || (inb_p(address + 7) != 0xff))
-      continue;
-    
     if (inb_p(address + LM78_ADDR_REG_OFFSET) == 0xff) {
       outb_p(0x00,address + LM78_ADDR_REG_OFFSET);
       if (inb_p(address + LM78_ADDR_REG_OFFSET) == 0xff)
diff --git a/kernel/chips/w83781d.c b/kernel/chips/w83781d.c
index cb5ef439..a4cb3cd9 100644
--- a/kernel/chips/w83781d.c
+++ b/kernel/chips/w83781d.c
@@ -372,11 +372,6 @@ int w83781d_detect_isa(struct isa_adapter *adapter)
     if (check_region(address, W83781D_EXTENT))
       continue;
 
-    /* Awful, but true: unused port addresses should return 0xff */
-    if ((inb_p(address + 1) != 0xff) || (inb_p(address + 2) != 0xff) ||
-       (inb_p(address + 3) != 0xff) || (inb_p(address + 7) != 0xff))
-      continue;
-    
     if (inb_p(address + W83781D_ADDR_REG_OFFSET) == 0xff) {
       outb_p(0x00,address + W83781D_ADDR_REG_OFFSET);
       if (inb_p(address + W83781D_ADDR_REG_OFFSET) == 0xff)