diff --git a/BoardConfig.mk b/BoardConfig.mk
index d2fede3c..f62cbdf9 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -34,6 +34,9 @@ TARGET_KERNEL_VERSION := 4.4
 BOARD_QTI_CAMERA_32BIT_ONLY := true
 $(call project-set-path,qcom-camera,$(DEVICE_PATH)/camera)
 
+# Crypto
+TARGET_HW_DISK_ENCRYPTION := true
+
 # Display
 TARGET_ADDITIONAL_GRALLOC_10_USAGE_BITS := 0x00002000U
 
diff --git a/configs/manifest.xml b/configs/manifest.xml
index 40f6f207..4b0b42ca 100644
--- a/configs/manifest.xml
+++ b/configs/manifest.xml
@@ -35,6 +35,15 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
             <instance>default</instance>
         </interface>
     </hal>
+    <hal format="hidl">
+        <name>vendor.qti.hardware.cryptfshw</name>
+        <transport>hwbinder</transport>
+        <version>1.0</version>
+        <interface>
+            <name>ICryptfsHw</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
     <!-- nfc -->
     <hal format="hidl">
         <name>android.hardware.nfc</name>
diff --git a/device.mk b/device.mk
index eeca991f..b1976118 100644
--- a/device.mk
+++ b/device.mk
@@ -108,6 +108,10 @@ PRODUCT_PACKAGES += \
     android.hardware.gatekeeper@1.0-impl \
     android.hardware.gatekeeper@1.0-service
 
+# HW crypto
+PRODUCT_PACKAGES += \
+    vendor.qti.hardware.cryptfshw@1.0-service-qti.qsee
+
 # Keymaster HAL
 PRODUCT_PACKAGES += \
     android.hardware.keymaster@3.0-impl \