diff --git a/CHANGES b/CHANGES
index 7f955cc1..24ae2af4 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,9 @@
 lm-sensors CHANGES file
 -----------------------
 
+SVN HEAD
+  sensors-detect: Add AMD family 15h CPU detection
+
 3.3.0 (2011-03-28)
   Makefile: Check for bison and flex
   libsensors: Add support for intrusion detection (#2370)
diff --git a/prog/detect/sensors-detect b/prog/detect/sensors-detect
index a09310e4..2d7943e9 100755
--- a/prog/detect/sensors-detect
+++ b/prog/detect/sensors-detect
@@ -2185,6 +2185,10 @@ use vars qw(@cpu_ids);
 		name => "AMD Family 12h and 14h thermal sensors",
 		driver => "k10temp",
 		detect => \&fam12h_14h_pci_detect,
+	}, {
+		name => "AMD Family 15h thermal sensors",
+		driver => "k10temp",
+		detect => \&fam15h_pci_detect,
 	}, {
 		name => "Intel digital thermal sensor",
 		driver => "coretemp",
@@ -6138,6 +6142,12 @@ sub fam12h_14h_pci_detect
 	return 9;
 }
 
+sub fam15h_pci_detect
+{
+	return unless exists $pci_list{'1022:1603'};
+	return 9;
+}
+
 sub intel_amb_detect
 {
 	if ((exists $pci_list{'8086:25f0'}) ||	# Intel 5000