diff --git a/baseconfig/arm/armv7/CONFIG_POWER_AVS b/baseconfig/arm/CONFIG_POWER_AVS
similarity index 100%
rename from baseconfig/arm/armv7/CONFIG_POWER_AVS
rename to baseconfig/arm/CONFIG_POWER_AVS
diff --git a/bcm2837-initial-support.patch b/bcm2837-initial-support.patch
index 1bd89f4c8..adccf4335 100644
--- a/bcm2837-initial-support.patch
+++ b/bcm2837-initial-support.patch
@@ -152,3 +152,66 @@ index 0000000..8216bbb
 -- 
 2.7.4
 
+From 345863374ebec9aa11ea97b99f5adbf97f99bbdf Mon Sep 17 00:00:00 2001
+From: Peter Robinson <pbrobinson@gmail.com>
+Date: Mon, 16 Jan 2017 06:38:08 +0000
+Subject: [PATCH] add upstream RPi3 fixes from arm64 DT
+
+Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
+---
+ arch/arm/boot/dts/bcm2837-rpi-3-b.dts | 8 +-------
+ arch/arm/boot/dts/bcm2837.dtsi        | 8 +++++++-
+ 2 files changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/arch/arm/boot/dts/bcm2837-rpi-3-b.dts b/arch/arm/boot/dts/bcm2837-rpi-3-b.dts
+index 7841b72..c309633 100644
+--- a/arch/arm/boot/dts/bcm2837-rpi-3-b.dts
++++ b/arch/arm/boot/dts/bcm2837-rpi-3-b.dts
+@@ -2,6 +2,7 @@
+ #include "bcm2837.dtsi"
+ #include "bcm2835-rpi.dtsi"
+ #include "bcm283x-rpi-smsc9514.dtsi"
++#include "bcm283x-rpi-usb-host.dtsi"
+ 
+ / {
+ 	compatible = "raspberrypi,3-model-b", "brcm,bcm2837";
+@@ -15,13 +16,6 @@
+ 		act {
+ 			gpios = <&gpio 47 0>;
+ 		};
+-
+-		pwr {
+-			label = "PWR";
+-			gpios = <&gpio 35 0>;
+-			default-state = "keep";
+-			linux,default-trigger = "default-on";
+-		};
+ 	};
+ };
+ 
+diff --git a/arch/arm/boot/dts/bcm2837.dtsi b/arch/arm/boot/dts/bcm2837.dtsi
+index 8216bbb..19f2fe6 100644
+--- a/arch/arm/boot/dts/bcm2837.dtsi
++++ b/arch/arm/boot/dts/bcm2837.dtsi
+@@ -1,7 +1,7 @@
+ #include "bcm283x.dtsi"
+ 
+ / {
+-	compatible = "brcm,bcm2836";
++	compatible = "brcm,bcm2837";
+ 
+ 	soc {
+ 		ranges = <0x7e000000 0x3f000000 0x1000000>,
+@@ -74,3 +74,9 @@
+ 	interrupt-parent = <&local_intc>;
+ 	interrupts = <8>;
+ };
++
++/* enable thermal sensor with the correct compatible property set */
++&thermal {
++	compatible = "brcm,bcm2837-thermal";
++	status = "okay";
++};
+-- 
+2.9.3
+
diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config
index aa63b78aa..0aac359af 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -3950,7 +3950,7 @@ CONFIG_PNFS_BLOCK=m
 CONFIG_PNFS_OBJLAYOUT=m
 # CONFIG_PNP_DEBUG_MESSAGES is not set
 CONFIG_POSIX_MQUEUE=y
-# CONFIG_POWER_AVS is not set
+CONFIG_POWER_AVS=y
 CONFIG_POWERCAP=y
 # CONFIG_POWER_RESET_BRCMKONA is not set
 CONFIG_POWER_RESET_GPIO_RESTART=y
diff --git a/kernel-aarch64.config b/kernel-aarch64.config
index 76ddc11a9..a4f2fa5c6 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -3929,7 +3929,7 @@ CONFIG_PNFS_BLOCK=m
 CONFIG_PNFS_OBJLAYOUT=m
 # CONFIG_PNP_DEBUG_MESSAGES is not set
 CONFIG_POSIX_MQUEUE=y
-# CONFIG_POWER_AVS is not set
+CONFIG_POWER_AVS=y
 CONFIG_POWERCAP=y
 # CONFIG_POWER_RESET_BRCMKONA is not set
 CONFIG_POWER_RESET_GPIO_RESTART=y
diff --git a/kernel.spec b/kernel.spec
index 864af16c7..119c72378 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2155,6 +2155,9 @@ fi
 #
 #
 %changelog
+* Mon Jan 16 2017 Peter Robinson <pbrobinson@fedoraproject.org>
+- Minor ARM updates
+
 * Fri Jan 13 2017 Justin M. Forbes <jforbes@fedoraproject.org> - 4.10.0-0.rc3.git4.1
 - Linux v4.10-rc3-187-g557ed56