diff --git a/CHANGES b/CHANGES
index 3534ea0..eedd1e2 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,9 @@
 i2c-tools CHANGES
 -----------------
 
+SVN
+  i2c-stub-from-dump: Use udev settle to speed up initialization
+
 3.0.2 (2008-11-29)
   i2c-dev.h: Drop I2C_FUNC_SMBUS_*I2C_BLOCK_2 defines
   decode-dimms: Add support for little-endian word hexdumps
diff --git a/stub/i2c-stub-from-dump b/stub/i2c-stub-from-dump
index f91da1c..1b7c3af 100755
--- a/stub/i2c-stub-from-dump
+++ b/stub/i2c-stub-from-dump
@@ -94,7 +94,11 @@ sub load_kernel_drivers
 	} else {
 		system("/sbin/modprobe", "i2c-stub") == 0 || exit 1;
 	}
-	sleep(1); # udev may take some time to create the device node
+	# 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);
+	}
 
 	$nr = get_i2c_stub_bus_number();
 	if (!defined($nr)) {