diff --git a/CHANGES b/CHANGES
index 1f43061f..8d4861eb 100644
--- a/CHANGES
+++ b/CHANGES
@@ -27,6 +27,7 @@ SVN HEAD
                         EMC1072, EMC1073, EMC1074, EMC1402, and EMC1424
                   Fixed address ranges checked for SMSC EMC1403 and EMC1404.
                   Fix detection of SPD EEPROM on DDR3 memory modules
+                  Add detection of AMD family 12h and 14h thermal sensors
 
 3.2.0 (2010-10-10)
   libsensors: Increase MAX_SENSORS_PER_TYPE to 24
diff --git a/prog/detect/sensors-detect b/prog/detect/sensors-detect
index 965e8dc2..6e1dc94d 100755
--- a/prog/detect/sensors-detect
+++ b/prog/detect/sensors-detect
@@ -2127,6 +2127,10 @@ use vars qw(@cpu_ids);
 		name => "AMD Family 11h thermal sensors",
 		driver => "k10temp",
 		detect => \&fam11h_pci_detect,
+	}, {
+		name => "AMD Family 12h and 14h thermal sensors",
+		driver => "k10temp",
+		detect => \&fam12h_14h_pci_detect,
 	}, {
 		name => "Intel digital thermal sensor",
 		driver => "coretemp",
@@ -6028,6 +6032,12 @@ sub fam11h_pci_detect
 	return 9;
 }
 
+sub fam12h_14h_pci_detect
+{
+	return unless exists $pci_list{'1022:1703'};
+	return 9;
+}
+
 sub intel_amb_detect
 {
 	if ((exists $pci_list{'8086:25f0'}) ||	# Intel 5000