diff --git a/init.target.rc b/init.target.rc
old mode 100755
new mode 100644
index 40e03f35..5dab76d5
--- a/init.target.rc
+++ b/init.target.rc
@@ -71,6 +71,7 @@ on post-fs-data
     mkdir /data/tombstones/wcnss 0771 system system
     mkdir /data/tombstones/dsps 0771 system system
     mkdir /data/vendor/hbtp 0750 system system
+    mkdir /persist/qti_fp 0700 system system
     mkdir /data/misc/seemp 0700 system system
     mkdir /data/misc/tloc 0700 system drmrpc
 
@@ -425,6 +426,11 @@ user system
 group system sdcard_rw
 socket seempdw dgram 0666 system system
 
+service qfp-daemon /vendor/bin/qfp-daemon
+    class late_start
+    user system
+    group system drmrpc diag input
+
 service tlocd /system/bin/tloc_daemon
     class late_start
     user system
diff --git a/manifest.xml b/manifest.xml
index 23d23a13..bba0679b 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -165,6 +165,25 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
             <instance>legacy/0</instance>
         </interface>
     </hal>
+    <!-- fingerprint hal: using remote service instead of Google's default service-->
+    <hal format="hidl">
+        <name>android.hardware.biometrics.fingerprint</name>
+        <transport>hwbinder</transport>
+        <version>2.1</version>
+        <interface>
+            <name>IBiometricsFingerprint</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+    <hal format="hidl">
+        <name>vendor.qti.hardware.fingerprint</name>
+        <transport>hwbinder</transport>
+        <version>1.0</version>
+        <interface>
+            <name>IQtiExtendedFingerprint</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
     <hal format="hidl">
         <name>android.hardware.bluetooth</name>
         <transport>hwbinder</transport>
diff --git a/sdm660_64.mk b/sdm660_64.mk
index 14d12e49..e20fc3f5 100644
--- a/sdm660_64.mk
+++ b/sdm660_64.mk
@@ -145,6 +145,10 @@ PRODUCT_PACKAGES += \
     wpa_supplicant_overlay.conf \
     p2p_supplicant_overlay.conf
 
+# Fingerprint feature
+PRODUCT_COPY_FILES += \
+    frameworks/native/data/etc/android.hardware.fingerprint.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.fingerprint.xml \
+
 #ANT+ stack
 PRODUCT_PACKAGES += \
     AntHalService \