diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-presence-config-native%/config.yaml b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-presence-config-native%/config.yaml
index c95f6c3..1420869 100644
--- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-presence-config-native%/config.yaml
+++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-presence-config-native%/config.yaml
@@ -1,25 +1,39 @@
-- Tach:
-  - PrettyName: fan2
-    Inventory: /system/chassis/motherboard/fan2
-    Description:
-    Sensors:
-      - fan2_0
-      - fan2_1
-  - PrettyName: fan0
-    Inventory: /system/chassis/motherboard/fan0
-    Description:
-    Sensors:
-      - fan0_0
-      - fan0_1
-  - PrettyName: fan1
-    Inventory: /system/chassis/motherboard/fan1
-    Description:
-    Sensors:
-      - fan1_0
-      - fan1_1
-  - PrettyName: fan3
-    Inventory: /system/chassis/motherboard/fan3
-    Description:
-    Sensors:
-      - fan3_0
-      - fan3_1
+- name: fan0
+  path: /system/chassis/motherboard/fan0
+  methods:
+    - type: tach
+      sensors:
+        - fan0_0
+        - fan0_1
+  rpolicy:
+    type: anyof
+
+- name: fan1
+  path: /system/chassis/motherboard/fan1
+  methods:
+    - type: tach
+      sensors:
+        - fan1_0
+        - fan1_1
+  rpolicy:
+    type: anyof
+
+- name: fan2
+  path: /system/chassis/motherboard/fan2
+  methods:
+    - type: tach
+      sensors:
+        - fan2_0
+        - fan2_1
+  rpolicy:
+    type: anyof
+
+- name: fan3
+  path: /system/chassis/motherboard/fan3
+  methods:
+    - type: tach
+      sensors:
+        - fan3_0
+        - fan3_1
+  rpolicy:
+    type: anyof
diff --git a/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan.bb b/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan.bb
index b28271b..e70bd5b 100644
--- a/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan.bb
+++ b/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan.bb
@@ -37,7 +37,7 @@
 # ${PN}-presence-tach specific configuration
 PACKAGECONFIG[presence] = " \
         --enable-presence \
-        FAN_DETECT_YAML_FILE=${STAGING_DIR_NATIVE}${presence_datadir}/config.yaml, \
+        PRESENCE_CONFIG=${STAGING_DIR_NATIVE}${presence_datadir}/config.yaml, \
         --disable-presence, \
         virtual/phosphor-fan-presence-config \
         , \
diff --git a/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan.inc b/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan.inc
index 74f33f9..208469b 100644
--- a/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan.inc
+++ b/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan.inc
@@ -2,4 +2,4 @@
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e"
 SRC_URI += "git://github.com/openbmc/phosphor-fan-presence"
-SRCREV = "4253fcaa5af69241ddc06ae72d3f94fd3b8818c9"
+SRCREV = "12e25b6045014bd103dbd112cfd5beb172b82722"