diff --git a/BUGS b/BUGS
index a99438a5..1b947a18 100644
--- a/BUGS
+++ b/BUGS
@@ -14,3 +14,7 @@ because it makes it impossible to remove the module.
 Alan Cox (alan@lxorguk.ukuu.org.uk), the maintainer of 2.0 kernels, has
 said he will consider patches that backport this 2.1 feature; perhaps it
 will be in 2.0.37. Until then, be careful when you unload modules.
+
+Module cdrom.o in all 2.2 kernels conflicts with our sensors.o module. Patches
+to correct this are being created. At this moment, make sure cdrom.o never
+gets unloaded, or you will almost certainly receive an Oops!
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index c07e50ce..7180812f 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -20,6 +20,8 @@ problems.
   Helped with some patches in lm_sensors version 1. He provided us with
   the original CVS archive, and even managed to explain to us how to use
   it.
+* Kyösti Mälkki <kmalkki@cc.hut.fi>
+  Author of the i2c-via driver.
 
 * Simon Vogl <simon@tk.uni-linz.ac.at>
   Wrote the new i2c kernel driver. This driver is indispensable for the