diff --git a/meta-openbmc-machines/meta-openpower/conf/machine/include/openpower.inc b/meta-openbmc-machines/meta-openpower/conf/machine/include/openpower.inc
index 89ad0ec..10fa40c 100644
--- a/meta-openbmc-machines/meta-openpower/conf/machine/include/openpower.inc
+++ b/meta-openbmc-machines/meta-openpower/conf/machine/include/openpower.inc
@@ -17,3 +17,5 @@
 VIRTUAL-RUNTIME_obmc-phosphor-flash-ctl = " \
        obmc-phosphor-example-pydbus \
        "
+
+PREFERRED_PROVIDER_virtual/obmc-phosphor-host-ipmi-hw = "host-ipmi-bt"
diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/conf/machine/palmetto.conf b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/conf/machine/palmetto.conf
index f1e4250..f6256a7 100644
--- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/conf/machine/palmetto.conf
+++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/conf/machine/palmetto.conf
@@ -10,5 +10,3 @@
 UBOOT_LOADADDRESS = "0x40008000"
 
 FLASH_SIZE = "32768"
-
-PREFERRED_PROVIDER_virtual/obmc-phosphor-host-ipmi-hw = "host-ipmi-bt"
diff --git a/meta-phosphor/common/recipes-phosphor/skeleton/skeleton.bb b/meta-phosphor/common/recipes-phosphor/skeleton/skeleton.bb
index f5375c4..c6369b0 100644
--- a/meta-phosphor/common/recipes-phosphor/skeleton/skeleton.bb
+++ b/meta-phosphor/common/recipes-phosphor/skeleton/skeleton.bb
@@ -9,9 +9,8 @@
 DEPENDS += "glib-2.0"
 RDEPENDS_${PN} += "python-subprocess python-tftpy"
 SRC_URI += "git://github.com/openbmc/skeleton"
-SRC_URI += "file://make.patch"
 
-SRCREV = "18d4591170779ceb81158c650d31c6c59115b2f2"
+SRCREV = "831188fedd74d86e137ec0c8e39c7395548ad480"
 
 S = "${WORKDIR}/git"
 
diff --git a/meta-phosphor/common/recipes-phosphor/skeleton/skeleton/make.patch b/meta-phosphor/common/recipes-phosphor/skeleton/skeleton/make.patch
deleted file mode 100644
index 17ec317..0000000
--- a/meta-phosphor/common/recipes-phosphor/skeleton/skeleton/make.patch
+++ /dev/null
@@ -1,120 +0,0 @@
-diff --git a/Makefile b/Makefile
-index b303513..b7f0053 100644
---- a/Makefile
-+++ b/Makefile
-@@ -4,77 +4,74 @@ OBJS	+= objects/pflash/libflash/libflash.o objects/pflash/libflash/libffs.o
- OBJS	+= objects/pflash/arm_io.o
- OBJS2   = progress.o ast-sf-ctrl.o libflash.o libffs.o arm_io.o
- OBJS3   = obj/progress.o obj/ast-sf-ctrl.o obj/libflash.o obj/libffs.o obj/arm_io.o
--LIBS = ./bin
--OFLAGS =-L$(LIBS) -lopenbmc_intf
--HOME = .
--CFLAGS=$(shell pkg-config --libs --cflags gio-unix-2.0 glib-2.0)
--#CFLAGS = -pthread -I/usr/include/gio-unix-2.0/ -I/usr/include/glib-2.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include -lgio-2.0 -lgobject-2.0 -lglib-2.0
-+INCLUDES=$(shell pkg-config --cflags gio-unix-2.0 glib-2.0) -Iincludes -Iobjects/pflash -I.
-+LIBS=$(shell pkg-config --libs gio-unix-2.0 glib-2.0) -Lbin -lopenbmc_intf
- 
- %.o: interfaces/%.c 
--	$(CC) -c -fPIC -o obj/$@ $< -I$(HOME) -I$(HOME)/includes $(CFLAGS)
-+	$(CC) -c -fPIC -o obj/$@ $< $(CFLAGS) $(INCLUDES)
- 
- %.o: objects/%.c
--	$(CC) -c -o obj/$@ $< -L$(LIBS) -I$(HOME) -I$(HOME)/includes -I$(HOME)/objects/pflash  $(CFLAGS)
-+	$(CC) -c -o obj/$@ $< $(LIBS) $(CFLAGS) $(INCLUDES)
- 
- %.o: includes/%.c
--	$(CC) -c -o obj/$@ $< -L$(LIBS) -I$(HOME) -I$(HOME)/includes -I$(HOME)/objects/pflash $(CFLAGS)
-+	$(CC) -c -o obj/$@ $< $(LIBS) $(CFLAGS) $(INCLUDES)
- 
- %.o: objects/pflash/%.c
--	$(CC) -c -o obj/$@ $< -I$(HOME) -I$(HOME)/objects/pflash  $(CFLAGS)
-+	$(CC) -c -o obj/$@ $< $(CFLAGS) $(INCLUDES)
- 
- %.o: objects/pflash/libflash/%.c
--	$(CC) -c -o obj/$@ $< -I$(HOME) -I$(HOME)/objects/pflash  $(CFLAGS)
-+	$(CC) -c -o obj/$@ $< $(CFLAGS) $(INCLUDES)
- 
- setup: 
--	mkdir obj
-+	mkdir -p obj
- 
- clean:  
- 	rm -rf obj
- 
- libopenbmc_intf: openbmc_intf.o
--	$(CC) -shared -o bin/$@.so obj/openbmc_intf.o $(CFLAGS)
-+	$(CC) -shared -o bin/$@.so obj/openbmc_intf.o $(LDFLAGS)
- 
--power_control: power_control_obj.o gpio.o
--	$(CC) -o bin/$@.exe obj/gpio.o obj/power_control_obj.o $(OFLAGS) $(CFLAGS)
-+power_control: power_control_obj.o gpio.o libopenbmc_intf
-+	$(CC) -o bin/$@.exe obj/gpio.o obj/power_control_obj.o $(LDFLAGS) $(LIBS)
- 
--led_controller: led_controller.o gpio.o
--	$(CC) -o bin/$@.exe obj/gpio.o obj/led_controller.o $(OFLAGS) $(CFLAGS)
-+led_controller: led_controller.o gpio.o libopenbmc_intf
-+	$(CC) -o bin/$@.exe obj/gpio.o obj/led_controller.o $(LDFLAGS) $(LIBS)
- 
--sensor_ambient: sensor_threshold.o sensor_temperature_ambient_obj.o
--	$(CC) -o bin/$@.exe obj/sensor_threshold.o obj/sensor_temperature_ambient_obj.o $(OFLAGS) $(CFLAGS)
-+sensor_ambient: sensor_threshold.o sensor_temperature_ambient_obj.o libopenbmc_intf
-+	$(CC) -o bin/$@.exe obj/sensor_threshold.o obj/sensor_temperature_ambient_obj.o $(LDFLAGS) $(LIBS)
- 
--button_power: button_power_obj.o gpio.o
--	$(CC) -o bin/$@.exe obj/button_power_obj.o obj/gpio.o $(OFLAGS) $(CFLAGS)
-+button_power: button_power_obj.o gpio.o libopenbmc_intf
-+	$(CC) -o bin/$@.exe obj/button_power_obj.o obj/gpio.o $(LDFLAGS) $(LIBS)
- 
--control_host: control_host_obj.o gpio.o
--	$(CC) -o bin/$@.exe obj/gpio.o obj/control_host_obj.o $(OFLAGS) $(CFLAGS)
-+control_host: control_host_obj.o gpio.o libopenbmc_intf
-+	$(CC) -o bin/$@.exe obj/gpio.o obj/control_host_obj.o $(LDFLAGS) $(LIBS)
- 
--flash_bios:  flash_bios_obj.o
--	$(CC) -o bin/$@.exe obj/flash_bios_obj.o $(OFLAGS)  $(CFLAGS)
-+flash_bios:  flash_bios_obj.o libopenbmc_intf
-+	$(CC) -o bin/$@.exe obj/flash_bios_obj.o $(LDFLAGS) $(LIBS)
- 
--fan: fan_generic_obj.o gpio.o
--	$(CC) -o bin/$@.exe obj/gpio.o obj/fan_generic_obj.o $(OFLAGS) $(CFLAGS)
-+fan: fan_generic_obj.o gpio.o libopenbmc_intf
-+	$(CC) -o bin/$@.exe obj/gpio.o obj/fan_generic_obj.o $(LDFLAGS) $(LIBS)
- 
--host_watchdog: host_watchdog_obj.o
--	$(CC) -o bin/$@.exe obj/host_watchdog_obj.o $(OFLAGS) $(CFLAGS)
-+host_watchdog: host_watchdog_obj.o libopenbmc_intf
-+	$(CC) -o bin/$@.exe obj/host_watchdog_obj.o $(LDFLAGS) $(LIBS)
- 
--control_bmc: control_bmc_obj.o
--	$(CC) -o bin/$@.exe obj/control_bmc_obj.o $(OFLAGS) $(CFLAGS)
-+control_bmc: control_bmc_obj.o libopenbmc_intf
-+	$(CC) -o bin/$@.exe obj/control_bmc_obj.o $(LDFLAGS) $(LIBS)
- 
--sensor_occ: sensor_occ_obj.o
--	$(CC) -o bin/$@.exe obj/sensor_occ_obj.o $(OFLAGS) $(CFLAGS)
-+sensor_occ: sensor_occ_obj.o libopenbmc_intf
-+	$(CC) -o bin/$@.exe obj/sensor_occ_obj.o $(LDFLAGS) $(LIBS)
- 
--board_vpd: board_vpd_obj.o
--	$(CC) -o bin/$@.exe obj/board_vpd_obj.o $(OFLAGS) $(CFLAGS)
-+board_vpd: board_vpd_obj.o libopenbmc_intf
-+	$(CC) -o bin/$@.exe obj/board_vpd_obj.o $(LDFLAGS) $(LIBS)
- 
--pcie_slot_present: pcie_slot_present_obj.o gpio.o
--	$(CC) -o bin/$@.exe obj/pcie_slot_present_obj.o obj/gpio.o $(OFLAGS) $(CFLAGS)
-+pcie_slot_present: pcie_slot_present_obj.o gpio.o libopenbmc_intf
-+	$(CC) -o bin/$@.exe obj/pcie_slot_present_obj.o obj/gpio.o $(LDFLAGS) $(LIBS)
- 
--flasher:  $(OBJS2) flasher_obj.o
--	$(CC) -o bin/$@.exe obj/flasher_obj.o $(OFLAGS)  $(OBJS3)  $(CFLAGS)
-+flasher:  $(OBJS2) flasher_obj.o libopenbmc_intf
-+	$(CC) -o bin/$@.exe obj/flasher_obj.o $(OBJS3) $(LDFLAGS) $(LIBS)
- 
--hwmon:  hwmon_intf.o
--	$(CC) -o bin/$@.exe obj/hwmon_intf.o $(OFLAGS)  $(CFLAGS)
-+hwmon:  hwmon_intf.o libopenbmc_intf
-+	$(CC) -o bin/$@.exe obj/hwmon_intf.o $(LDFLAGS) $(LIBS)
- 
- 
--all: clean setup libopenbmc_intf power_control led_controller sensor_ambient button_power control_host fan host_watchdog control_bmc board_vpd pcie_slot_present flash_bios flasher
-+all: setup libopenbmc_intf power_control led_controller sensor_ambient button_power control_host fan host_watchdog control_bmc board_vpd pcie_slot_present flash_bios flasher