diff --git a/CHANGES b/CHANGES
index ae419b06..9b078d30 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,9 @@
 lm-sensors CHANGES file
 -----------------------
 
+SVN HEAD
+  sensors-detect: Give udev time to settle before accessing i2c nodes
+
 3.1.2 (2010-02-02)
   libsensors: Support upcoming sysfs path to i2c adapters
               Add support for HID devices
diff --git a/prog/detect/sensors-detect b/prog/detect/sensors-detect
index 97f69aca..a90a02ed 100755
--- a/prog/detect/sensors-detect
+++ b/prog/detect/sensors-detect
@@ -5892,6 +5892,12 @@ sub main
 		$by_default = 1 if dmi_match('board_vendor', 'asustek', 'tyan',
 					     'supermicro');
 
+		# udev may take some time to create the device node
+		if (!(-x "/sbin/udevadm" && system("/sbin/udevadm settle") == 0)
+		 && !(-x "/sbin/udevsettle" && system("/sbin/udevsettle") == 0)) {
+			sleep(1);
+		}
+
 		for (my $dev_nr = 0; $dev_nr < @i2c_adapters; $dev_nr++) {
 			next unless exists $i2c_adapters[$dev_nr];
 			scan_i2c_adapter($dev_nr, $by_default);