diff --git a/doc/modules b/doc/modules
index 2e84f7d8..e11173c3 100644
--- a/doc/modules
+++ b/doc/modules
@@ -56,10 +56,14 @@ at all!
   SMBus emulation on i2c busses. Base algorithm, on which SMBus-only adapters
   rely.
 
-(src) piix4: smbus i2c-core
+(src) i2c-piix4: smbus i2c-core
   PIIX4 SMBus access.
 
-(src) isa: i2c-core
+(src) i2c-via: algo-bit i2c-core
+  VIA VT82C586B bus access. This is often used instead of the PIIX4 as SMBus
+  host.
+
+(src) i2c-isa: i2c-core
   Defines the ISA bus as being a I2C adapter. It isn't, of course; but this is
   often used by sensor client modules, to keep the code small and simple.
 
@@ -87,10 +91,6 @@ at all!
     i2c_debug (i) debug level - 0 off; 1 normal; 2,3 more verbose; 
                   9 bit-protocol
 
-(i2c) bit-mb: algo-bit i2c-core
-  VIA VT82C586B bus access. This is often used instead of the PIIX4 as SMBus
-  host.
-
 (i2c) bit-lp: algo-bit i2c-core
   I2C bus through the parallel port, Philips interface
   Do not insert this module unless you are sure you have this interface;
@@ -109,9 +109,6 @@ at all!
   /dev interface for I2C adapters. This will be superseded by a module which
   will also implement SMBus access.
 
-(i2c) hw-monitor: ???
-  Old skeleton driver for GL518SM. Superseded by the gl518sm module.
-
 Several other modules are not yet ported by Simon Vogl. They are mostly in
 i2c/old-code.
 
diff --git a/i2c/MODIFICATIONS b/i2c/MODIFICATIONS
index 62d89cae..b8805676 100644
--- a/i2c/MODIFICATIONS
+++ b/i2c/MODIFICATIONS
@@ -11,6 +11,12 @@ The current version of Simon's code is called mod-19990118.tar.gz.
 
 Here come the changes:
 
+! Renamed #define HW_B_MB to HW_B_VIA in i2c.h
+ 
+* Moved files: bit-via.c and README.bit-via
+  These are now under lm_sensors source tree as
+   kernel/busses/i2c-via.c and doc/busses/i2c-via
+
 * EXPORT_SYMBOL declarations put between #ifdef statements
   They only work if you use the Linux source tree Makefiles. As we want to
   use our own Makefile, we have removed them. This should have almost no
diff --git a/i2c/Makefile b/i2c/Makefile
index 0433d056..6186f330 100644
--- a/i2c/Makefile
+++ b/i2c/Makefile
@@ -11,7 +11,7 @@ MOD_SUB_DIRS = drivers
 #MX_OBJS       = i2c-core.o algo-bit.o i2c-dev.o bit-lp.o bit-velle.o algo-pcf.o
 MX_OBJS       = i2c-core.o algo-bit.o i2c-dev.o
 
-M_OBJS      = bit-lp.o bit-velle.o bit-via.o
+M_OBJS      = bit-lp.o bit-velle.o
 EXTRA_CFLAGS = -Wno-unused
 
 here:
diff --git a/i2c/Module.mk b/i2c/Module.mk
index 5aeb41fe..242e3fbe 100644
--- a/i2c/Module.mk
+++ b/i2c/Module.mk
@@ -23,8 +23,8 @@ MODULE_DIR := i2c
 # Regrettably, even 'simply expanded variables' will not put their currently
 # defined value verbatim into the command-list of rules...
 I2CTARGETS := $(MODULE_DIR)/i2c-core.o  $(MODULE_DIR)/algo-bit.o \
-              $(MODULE_DIR)/bit-lp.o \
-              $(MODULE_DIR)/bit-velle.o $(MODULE_DIR)/bit-via.o
+              $(MODULE_DIR)/bit-lp.o    $(MODULE_DIR)/bit-velle.o
+
 I2CADDTARGETS := $(MODULE_DIR)/i2c-dev.o
 
 I2CHEADERFILES := $(MODULE_DIR)/i2c.h
diff --git a/i2c/README b/i2c/README
index bf71bd39..180e77e7 100644
--- a/i2c/README
+++ b/i2c/README
@@ -8,7 +8,6 @@ Currently, the following modules are running in the new mode:
 	algo-bit.c	- Algorithms for bit banging
 	bit-lp.c	- hw part for parallel port adapter, Philips interface
 	bit-velle.c	- hw part for parallel port adapter, Vellemann K9000
-	bit-mb		- VIA Chipset motherboards' SMBus -> see README.bitmb
 
 The other modules, esp. algo-pcf.c still need to be converted. For the
 hw specific mods, this should be relatively easy & quick.
diff --git a/i2c/i2c.h b/i2c/i2c.h
index f656e975..38f45e88 100644
--- a/i2c/i2c.h
+++ b/i2c/i2c.h
@@ -336,7 +336,7 @@ extern int i2c_adapter_id(struct i2c_adapter *adap);
 #define HW_B_VELLE	0x04	/* Vellemann K8000			*/
 #define HW_B_BT848	0x05	/* BT848 video boards			*/
 #define HW_B_WNV	0x06	/* Winnov Videums			*/
-#define HW_B_MB         0x07    /* Via vt82c586b			*/
+#define HW_B_VIA        0x07    /* Via vt82c586b			*/
 
 /* --- PCF 8584 based algorithms					*/
 #define HW_P_LP		0x00	/* Parallel port interface		*/
diff --git a/kernel/busses/Module.mk b/kernel/busses/Module.mk
index c761c5b7..740f3ac1 100644
--- a/kernel/busses/Module.mk
+++ b/kernel/busses/Module.mk
@@ -22,7 +22,8 @@ MODULE_DIR := kernel/busses
 
 # Regrettably, even 'simply expanded variables' will not put their currently
 # defined value verbatim into the command-list of rules...
-KERNELBUSSESTARGETS := $(MODULE_DIR)/i2c-piix4.o $(MODULE_DIR)/i2c-isa.o
+KERNELBUSSESTARGETS := $(MODULE_DIR)/i2c-piix4.o $(MODULE_DIR)/i2c-isa.o \
+		       $(MODULE_DIR)/i2c-via.o
 
 # Include all dependency files
 INCLUDEFILES += $(KERNELBUSSESTARGETS:.o=.d)