diff --git a/CHANGES b/CHANGES
index ef25032..11dbbdd 100644
--- a/CHANGES
+++ b/CHANGES
@@ -18,6 +18,7 @@ SVN
   i2c-stub-from-dump: Use udev settle to speed up initialization
                       Unload i2c-stub automatically if needed
                       Add support for multiple dumps
+  tools: Properly handle /dev/i2c not being a directory
 
 3.0.2 (2008-11-29)
   i2c-dev.h: Drop I2C_FUNC_SMBUS_*I2C_BLOCK_2 defines
diff --git a/tools/i2cbusses.c b/tools/i2cbusses.c
index 693c191..ee0348c 100644
--- a/tools/i2cbusses.c
+++ b/tools/i2cbusses.c
@@ -378,7 +378,7 @@ int open_i2c_dev(const int i2cbus, char *filename, const int quiet)
 	sprintf(filename, "/dev/i2c/%d", i2cbus);
 	file = open(filename, O_RDWR);
 
-	if (file < 0 && errno == ENOENT) {
+	if (file < 0 && (errno == ENOENT || errno == ENOTDIR)) {
 		sprintf(filename, "/dev/i2c-%d", i2cbus);
 		file = open(filename, O_RDWR);
 	}