diff --git a/common/recipes-kernel/linux/linux-obmc/0001-ARM-dts-Aspeed-Witherspoon-Update-BMC-partitioning.patch b/common/recipes-kernel/linux/linux-obmc/0001-ARM-dts-Aspeed-Witherspoon-Update-BMC-partitioning.patch
index 3407f2f..f514ef2 100644
--- a/common/recipes-kernel/linux/linux-obmc/0001-ARM-dts-Aspeed-Witherspoon-Update-BMC-partitioning.patch
+++ b/common/recipes-kernel/linux/linux-obmc/0001-ARM-dts-Aspeed-Witherspoon-Update-BMC-partitioning.patch
@@ -1,4 +1,4 @@
-From 8b1e098b70d2701ad2b53d4527c2423b7c2f7ce1 Mon Sep 17 00:00:00 2001
+From 3e0b58ab998209b392a2870124503659245c2483 Mon Sep 17 00:00:00 2001
 From: "Edward A. James" <eajames@us.ibm.com>
 Date: Wed, 16 Aug 2017 07:58:56 -0500
 Subject: [PATCH] ARM: dts: Aspeed: Witherspoon: Update BMC partitioning
@@ -7,17 +7,18 @@
 default in Witherspoon.
 
 Signed-off-by: Edward A. James <eajames@us.ibm.com>
+Signed-off-by: Joel Stanley <joel@jms.id.au>
 ---
  .../boot/dts/aspeed-bmc-alt-opp-flash-layout-ubi.dtsi  | 18 ++++++++++++++++++
  arch/arm/boot/dts/aspeed-bmc-opp-flash-layout-ubi.dtsi | 18 ++++++++++++++++++
- arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts       |  5 +++--
- 3 files changed, 39 insertions(+), 2 deletions(-)
+ arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts       |  3 ++-
+ 3 files changed, 38 insertions(+), 1 deletion(-)
  create mode 100644 arch/arm/boot/dts/aspeed-bmc-alt-opp-flash-layout-ubi.dtsi
  create mode 100644 arch/arm/boot/dts/aspeed-bmc-opp-flash-layout-ubi.dtsi
 
 diff --git a/arch/arm/boot/dts/aspeed-bmc-alt-opp-flash-layout-ubi.dtsi b/arch/arm/boot/dts/aspeed-bmc-alt-opp-flash-layout-ubi.dtsi
 new file mode 100644
-index 0000000..9277599
+index 000000000000..927759950023
 --- /dev/null
 +++ b/arch/arm/boot/dts/aspeed-bmc-alt-opp-flash-layout-ubi.dtsi
 @@ -0,0 +1,18 @@
@@ -41,7 +42,7 @@
 +		};
 diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-flash-layout-ubi.dtsi b/arch/arm/boot/dts/aspeed-bmc-opp-flash-layout-ubi.dtsi
 new file mode 100644
-index 0000000..0059ad1
+index 000000000000..0059ad16d2ba
 --- /dev/null
 +++ b/arch/arm/boot/dts/aspeed-bmc-opp-flash-layout-ubi.dtsi
 @@ -0,0 +1,18 @@
@@ -64,25 +65,25 @@
 +				};
 +		};
 diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts b/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts
-index dd30c20..51f965e 100644
+index b24ea9967fc8..0b69aa942e18 100644
 --- a/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts
 +++ b/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts
-@@ -174,12 +174,13 @@
+@@ -182,13 +182,14 @@
  		status = "okay";
+ 		label = "bmc";
  		m25p,fast-read;
- 
 -#include "openbmc-flash-layout.dtsi"
 +#include "aspeed-bmc-opp-flash-layout-ubi.dtsi"
  	};
+ 
  	flash@1 {
  		status = "okay";
--		label = "alt";
+ 		label = "alt";
  		m25p,fast-read;
-+
 +#include "aspeed-bmc-alt-opp-flash-layout-ubi.dtsi"
  	};
  };
  
 -- 
-1.8.3.1
+2.15.1
 
diff --git a/common/recipes-kernel/linux/linux-obmc_4.10.bb b/common/recipes-kernel/linux/linux-obmc_4.10.bb
deleted file mode 100644
index 4dc958d..0000000
--- a/common/recipes-kernel/linux/linux-obmc_4.10.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-KBRANCH ?= "dev-4.10"
-LINUX_VERSION ?= "4.10.17"
-
-SRCREV="d7ccda2b787f8589c65f3943d854ee0ea9b69c50"
-
-require linux-obmc.inc
diff --git a/common/recipes-kernel/linux/linux-obmc_4.13.bb b/common/recipes-kernel/linux/linux-obmc_4.13.bb
new file mode 100644
index 0000000..ec7ee3e
--- /dev/null
+++ b/common/recipes-kernel/linux/linux-obmc_4.13.bb
@@ -0,0 +1,6 @@
+KBRANCH ?= "dev-4.13"
+LINUX_VERSION ?= "4.13.16"
+
+SRCREV="462662bc3577d0c73e30cdc96eb28d63c89528df"
+
+require linux-obmc.inc
diff --git a/common/recipes-phosphor/sensors/phosphor-hwmon.bb b/common/recipes-phosphor/sensors/phosphor-hwmon.bb
index 9cc70dd..5bef75b 100644
--- a/common/recipes-phosphor/sensors/phosphor-hwmon.bb
+++ b/common/recipes-phosphor/sensors/phosphor-hwmon.bb
@@ -25,6 +25,7 @@
         sdbusplus \
         phosphor-dbus-interfaces \
         phosphor-logging \
+        bash \
         "
 
 RRECOMMENDS_${PN} += "${VIRTUAL-RUNTIME_phosphor-hwmon-config}"
@@ -35,6 +36,7 @@
 SRC_URI += "git://github.com/openbmc/phosphor-hwmon"
 SRC_URI += "file://70-hwmon.rules"
 SRC_URI += "file://70-iio.rules"
+SRC_URI += "file://start_hwmon.sh"
 
 SRCREV = "a23babd6952cb21397d6aa408a827047d1de81de"
 
@@ -45,4 +47,7 @@
         install -d ${D}/${base_libdir}/udev/rules.d/
         install ${WORKDIR}/70-hwmon.rules ${D}/${base_libdir}/udev/rules.d/
         install ${WORKDIR}/70-iio.rules ${D}/${base_libdir}/udev/rules.d/
+
+        install -d ${D}${bindir}
+        install -m 0755 ${WORKDIR}/start_hwmon.sh ${D}${bindir}
 }
diff --git a/common/recipes-phosphor/sensors/phosphor-hwmon/70-hwmon.rules b/common/recipes-phosphor/sensors/phosphor-hwmon/70-hwmon.rules
index 070d88f..503b2d0 100644
--- a/common/recipes-phosphor/sensors/phosphor-hwmon/70-hwmon.rules
+++ b/common/recipes-phosphor/sensors/phosphor-hwmon/70-hwmon.rules
@@ -1 +1,2 @@
-SUBSYSTEM=="hwmon", ACTION=="add", TAG+="systemd", ENV{SYSTEMD_WANTS}+="xyz.openbmc_project.Hwmon@%E{OF_FULLNAME}.service"
+SUBSYSTEM=="hwmon", ACTION=="add", RUN="/usr/bin/start_hwmon.sh start %p %E{OF_FULLNAME}"
+SUBSYSTEM=="hwmon", ACTION=="remove", RUN="/usr/bin/start_hwmon.sh stop %p %E{OF_FULLNAME}"
diff --git a/common/recipes-phosphor/sensors/phosphor-hwmon/70-iio.rules b/common/recipes-phosphor/sensors/phosphor-hwmon/70-iio.rules
index f332d11..45fb4b0 100644
--- a/common/recipes-phosphor/sensors/phosphor-hwmon/70-iio.rules
+++ b/common/recipes-phosphor/sensors/phosphor-hwmon/70-iio.rules
@@ -1 +1,2 @@
-SUBSYSTEM=="iio", ACTION=="add", TAG+="systemd", ENV{SYSTEMD_WANTS}+="xyz.openbmc_project.Hwmon@%E{OF_FULLNAME}.service"
+SUBSYSTEM=="iio", ACTION=="add", RUN="/usr/bin/start_hwmon.sh start %p %E{OF_FULLNAME}"
+SUBSYSTEM=="iio", ACTION=="remove", RUN="/usr/bin/start_hwmon.sh stop %p %E{OF_FULLNAME}"
diff --git a/common/recipes-phosphor/sensors/phosphor-hwmon/start_hwmon.sh b/common/recipes-phosphor/sensors/phosphor-hwmon/start_hwmon.sh
new file mode 100755
index 0000000..cde0f96
--- /dev/null
+++ b/common/recipes-phosphor/sensors/phosphor-hwmon/start_hwmon.sh
@@ -0,0 +1,22 @@
+#!/bin/bash
+
+action=$1
+devpath=$2
+of_fullname=$3
+
+#Use of_fullname if it's there, otherwise use devpath.
+
+path=$of_fullname
+if [ -z "$path" ]
+then
+    path=$devpath
+
+    if [[ "$path" =~ (.*)/hwmon/hwmon[0-9]+$ ]];
+    then
+        path=${BASH_REMATCH[1]}
+    fi
+fi
+
+path="${path//:/--}"
+
+systemctl $action 'xyz.openbmc_project.Hwmon@'$path'.service'
diff --git a/common/recipes-phosphor/sensors/phosphor-hwmon/xyz.openbmc_project.Hwmon@.service b/common/recipes-phosphor/sensors/phosphor-hwmon/xyz.openbmc_project.Hwmon@.service
index 8dca3ad..9d3e263 100644
--- a/common/recipes-phosphor/sensors/phosphor-hwmon/xyz.openbmc_project.Hwmon@.service
+++ b/common/recipes-phosphor/sensors/phosphor-hwmon/xyz.openbmc_project.Hwmon@.service
@@ -1,11 +1,10 @@
 [Unit]
 Description=Phosphor Hwmon Poller
 ConditionFileNotEmpty=/etc/default/obmc/hwmon/%I.conf
-StopWhenUnneeded=true
 After=xyz.openbmc_project.ObjectMapper.service
 
 [Service]
-Restart=always
+Restart=on-failure
 ExecStart=/usr/bin/env phosphor-hwmon-readd -o %f
 SyslogIdentifier=phosphor-hwmon-readd
 EnvironmentFile=/etc/default/obmc/hwmon/%I.conf