diff --git a/debian/changelog b/debian/changelog
index 42edcbe31..99d37d09e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+linux-2.6 (3.0.0-3) UNRELEASED; urgency=low
+
+  [ Ben Hutchings ]
+  * Disable SENSORS_SHT15, unlikely to be usable on any supported platform
+    (Closes: #638696)
+
+ -- Ben Hutchings <ben@decadent.org.uk>  Sun, 21 Aug 2011 16:18:29 +0100
+
 linux-2.6 (3.0.0-2) unstable; urgency=high
 
   [ Aurelien Jarno ]
diff --git a/debian/config/config b/debian/config/config
index 337ed5c12..e2ac19bae 100644
--- a/debian/config/config
+++ b/debian/config/config
@@ -466,7 +466,7 @@ CONFIG_SENSORS_MAX6642=m
 CONFIG_SENSORS_MAX6650=m
 CONFIG_SENSORS_PC87427=m
 CONFIG_SENSORS_PMBUS=m
-CONFIG_SENSORS_SHT15=m
+# CONFIG_SENSORS_SHT15 is not set
 CONFIG_SENSORS_SHT21=m
 CONFIG_SENSORS_DME1737=m
 CONFIG_SENSORS_EMC1403=m