diff --git a/CHANGES b/CHANGES
index 5b57d723..ba383951 100644
--- a/CHANGES
+++ b/CHANGES
@@ -3,6 +3,7 @@ lm-sensors CHANGES file
 
 SVN HEAD
   sensors-detect: Don't choke on systems without PCI
+                  Avoid probing EDID addresses on graphics cards (#2386)
 
 3.3.2 (2012-03-14)
   libsensors: Added support for new sysfs attributes
diff --git a/prog/detect/sensors-detect b/prog/detect/sensors-detect
index 970e26ff..58f7fd05 100755
--- a/prog/detect/sensors-detect
+++ b/prog/detect/sensors-detect
@@ -3660,6 +3660,9 @@ sub scan_i2c_adapter
 		$input = <STDIN>;
 		chomp($input);
 		@not_to_scan = parse_not_to_scan(0x03, 0x77, $input);
+	} elsif (($class & 0xff00) == 0x0300) {
+		# Skip EDID addresses by default on graphics adapters
+		@not_to_scan = parse_not_to_scan(0x03, 0x77, "0x50-0x57");
 	}
 
 	open(local *FILE, "$dev_i2c$adapter_nr") or