diff --git a/init/init_land.cpp b/init/init_land.cpp
index 2e45e9c..b9c4a86 100644
--- a/init/init_land.cpp
+++ b/init/init_land.cpp
@@ -105,4 +105,15 @@ void vendor_load_properties()
     } else {
         property_set("ro.product.model", "Redmi 3S");
     }
-}
+    if (buf.find("S88537AA1") != std::string::npos) {
+        property_set("persist.sys.fp.goodix", "1");
+        property_set("persist.sys.fp.onstart", "1");
+        property_set("persist.sys.fp.vendor", "goodix");
+        property_set("ro.boot.fpsensor", "gdx");
+    } else {
+        property_set("persist.sys.fp.goodix", "0");
+        property_set("persist.sys.fp.onstart", "1");
+        property_set("persist.sys.fp.vendor", "searchf");
+        property_set("ro.boot.fpsensor", "fpc");
+    }
+}
\ No newline at end of file
diff --git a/rootdir/init.qcom.rc b/rootdir/init.qcom.rc
index 7a16a6e..682ad6f 100644
--- a/rootdir/init.qcom.rc
+++ b/rootdir/init.qcom.rc
@@ -348,6 +348,9 @@ on boot
 
     # bond0 used by FST Manager
     chown wifi wifi /sys/class/net/bond0/bonding/queue_id
+    # Goodix Fingerprint
+    chown system system /dev/goodix_fp
+    chmod 0644 /dev/goodix_fp
 
     chown root system /sys/class/leds/red/blink
     chown root system /sys/class/leds/green/blink
@@ -743,12 +746,19 @@ service fingerprintd /system/bin/fingerprintd
     group system sdcard_rw
     disabled
 
-    setprop persist.sys.fp.vendor searchf
-    start fingerprintd
-    setprop ro.boot.fpsensor fpc
+service gx_fpd /system/bin/gx_fpd
+    class core
+    user root
+    group system system
+    disabled
 
-on property:persist.sys.fp.onstart=1
-   start fingerprintd
+on property:persist.sys.fp.vendor=goodix
+       stop fingerprintd
+       start gx_fpd
+
+on property:persist.sys.fp.vendor=searchf
+        stop gx_fpd
+        start fingerprintd
 
 # Start camera server as daemon
 service qcamerasvr /system/bin/mm-qcamera-daemon