diff --git a/config-arm-generic b/config-arm-generic
index 19d9466f8..60f7f7e45 100644
--- a/config-arm-generic
+++ b/config-arm-generic
@@ -493,6 +493,8 @@ CONFIG_SENSORS_IIO_HWMON=m
 CONFIG_IIO_SYSFS_TRIGGER=m
 CONFIG_SENSORS_ARM_SCPI=m
 CONFIG_IIO_ST_PRESS=m
+CONFIG_TMP006=m
+CONFIG_BMP280=m
 
 # PHY framework
 CONFIG_GENERIC_PHY=y
@@ -638,7 +640,6 @@ CONFIG_NET_VENDOR_MELLANOX=y
 # CONFIG_DEBUG_SET_MODULE_RONX is not set
 # CONFIG_CORESIGHT is not set
 # CONFIG_LATTICE_ECP3_CONFIG is not set
-# CONFIG_BMP085_SPI is not set
 # CONFIG_TI_DAC7512 is not set
 
 # https://fedoraproject.org/wiki/Features/Checkpoint_Restore
diff --git a/config-armv7-generic b/config-armv7-generic
index 4c0e73a88..b2f8f5274 100644
--- a/config-armv7-generic
+++ b/config-armv7-generic
@@ -619,11 +619,6 @@ CONFIG_GENERIC_ADC_BATTERY=m
 CONFIG_BATTERY_SBS=m
 
 # Sensors
-CONFIG_TMP006=m
-CONFIG_BMP085=y
-CONFIG_BMP085_I2C=m
-CONFIG_BMP085_SPI=m
-CONFIG_BMP280=m
 CONFIG_SENSORS_AD7314=m
 CONFIG_SENSORS_ADCXX=m
 CONFIG_SENSORS_ADS7871=m
diff --git a/kernel.spec b/kernel.spec
index 44461f820..7ff697688 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2151,6 +2151,10 @@ fi
 #
 #
 %changelog
+* Sun Sep  4 2016 Peter Robinson <pbrobinson@fedoraproject.org>
+- Use IIO BMP280 driver instead of old misc driver, wider HW support
+- Minor sensor driver changes
+
 * Fri Sep 02 2016 Justin M. Forbes <jforbes@fedoraproject.org> - 4.8.0-0.rc4.git4.1
 - Linux v4.8-rc4-199-gcc4163d