diff --git a/CHANGES b/CHANGES
index 3ab3d42..8559fe2 100644
--- a/CHANGES
+++ b/CHANGES
@@ -16,7 +16,11 @@ SVN
   decode-xeon: Delete
   eepromer: Fix array initialization overrun
   i2cdetect: Drop legacy reference to ISA bus
+             Drop arbitrary limit on I2C bus number
+  i2cdump: Drop arbitrary limit on I2C bus number
+  i2cget: Drop arbitrary limit on I2C bus number
   i2cset: Add support for short writes with PEC
+          Drop arbitrary limit on I2C bus number
   i2c-stub-from-dump: Use udev settle to speed up initialization
                       Unload i2c-stub automatically if needed
                       Add support for multiple dumps
diff --git a/tools/i2cbusses.c b/tools/i2cbusses.c
index ee0348c..f7f3a47 100644
--- a/tools/i2cbusses.c
+++ b/tools/i2cbusses.c
@@ -332,16 +332,16 @@ done:
  */
 int lookup_i2c_bus(const char *i2cbus_arg)
 {
-	long i2cbus;
+	unsigned long i2cbus;
 	char *end;
 
-	i2cbus = strtol(i2cbus_arg, &end, 0);
+	i2cbus = strtoul(i2cbus_arg, &end, 0);
 	if (*end || !*i2cbus_arg) {
 		/* Not a number, maybe a name? */
 		return lookup_i2c_bus_by_name(i2cbus_arg);
 	}
-	if (i2cbus < 0 || i2cbus > 0xff) {
-		fprintf(stderr, "Error: I2C bus out of range (0-255)!\n");
+	if (i2cbus > INT_MAX) {
+		fprintf(stderr, "Error: I2C bus out of range!\n");
 		return -2;
 	}