diff --git a/Huawei/Fingerprint/fingerprint.kl b/Huawei/Fingerprint/fingerprint.kl
new file mode 100644
index 0000000..9c6256c
--- /dev/null
+++ b/Huawei/Fingerprint/fingerprint.kl
@@ -0,0 +1,7 @@
+key 28    HOME          VIRTUAL
+key 105   APP_SWITCH
+key 106   APP_SWITCH
+key 118   WAKEUP
+key 174   BACK
+key 108   SYSTEM_NAVIGATION_DOWN
+key 103   SYSTEM_NAVIGATION_UP
diff --git a/Huawei/Fingerprint/hw-fingerprint.rc b/Huawei/Fingerprint/hw-fingerprint.rc
index cbb1a72..42d41c8 100644
--- a/Huawei/Fingerprint/hw-fingerprint.rc
+++ b/Huawei/Fingerprint/hw-fingerprint.rc
@@ -1,8 +1,8 @@
 service hw-fpnav /system/bin/hw-fpnav
+    seclabel u:r:phhsu_daemon:s0
 	user root
 	oneshot
 	disabled
 
 on property:sys.boot_completed=1
 	start hw-fpnav
-	
diff --git a/Huawei/Fingerprint/hw-fpnav b/Huawei/Fingerprint/hw-fpnav
index 2f3c4a4..6bfe0b7 100644
--- a/Huawei/Fingerprint/hw-fpnav
+++ b/Huawei/Fingerprint/hw-fpnav
@@ -3,7 +3,7 @@
 set -x
 
 #Do this only on devices with huawei fingerprint HAL
-lshal |grep -qF vendor.huawei.hardware.biometrics.fingerprint || exit 0
+grep -qF vendor.huawei.hardware.biometrics.fingerprint /vendor/manifest.xml || exit 0
 
 #Ask fingerprint hardware service to enable navigation
 CLASSPATH=/system/phh/hw-fpnav.dex \
diff --git a/overlay.mk b/overlay.mk
index 8822bb8..3c0dd72 100644
--- a/overlay.mk
+++ b/overlay.mk
@@ -10,5 +10,7 @@
 PRODUCT_PACKAGES += \
 	hw-fpnav-daemon
 PRODUCT_COPY_FILES += \
+	vendor/hardware_overlay/Huawei/Fingerprint/hw-fingerprint.rc:system/etc/init/hw-fingerprint.rc \
 	vendor/hardware_overlay/Huawei/Fingerprint/hw-fpnav:system/bin/hw-fpnav \
-	vendor/hardware_overlay/Huawei/Fingerprint/hw-fpnav.dex:system/phh/hw-fpnav.dex
+	vendor/hardware_overlay/Huawei/Fingerprint/hw-fpnav.dex:system/phh/hw-fpnav.dex \
+	vendor/hardware_overlay/Huawei/Fingerprint/fingerprint.kl:system/phh/huawei/fingerprint.kl