diff --git a/device.mk b/device.mk
index 0132e1ba..c32b08ad 100755
--- a/device.mk
+++ b/device.mk
@@ -178,6 +178,10 @@ PRODUCT_COPY_FILES += \
 PRODUCT_PACKAGES += \
     android.hardware.health@2.0-service
 
+# Keymaster 4 (software only)
+PRODUCT_PACKAGES += \
+    android.hardware.keymaster@4.0-service
+
 # Audio fluence, ns, aec property, voice and media volume steps
 PRODUCT_PROPERTY_OVERRIDES += \
     ro.qc.sdk.audio.fluencetype=fluencepro \
diff --git a/manifest.xml b/manifest.xml
index 961b0644..d065341f 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -167,6 +167,15 @@
             <instance>default</instance>
         </interface>
     </hal>
+    <hal format="hidl">
+        <name>android.hardware.keymaster</name>
+        <transport>hwbinder</transport>
+        <version>4.0</version>
+        <interface>
+            <name>IKeymasterDevice</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
     <hal format="hidl">
         <name>android.hardware.light</name>
         <transport>hwbinder</transport>