diff --git a/Android.mk b/Android.mk
index 2b7d7db..fc13afc 100644
--- a/Android.mk
+++ b/Android.mk
@@ -84,7 +84,7 @@
 #    libm \
 #    libc
 
-LOCAL_C_INCLUDES += bionic external/stlport/stlport
+LOCAL_C_INCLUDES += bionic external/stlport/stlport external/openssl/include
 
 LOCAL_STATIC_LIBRARIES :=
 LOCAL_SHARED_LIBRARIES :=
@@ -281,6 +281,11 @@
     #LOCAL_SRC_FILES += crypto/jb/cryptfs.c
     #LOCAL_C_INCLUDES += system/extras/ext4_utils external/openssl/include
 endif
+ifeq ($(TW_INCLUDE_L_CRYPTO), true)
+    LOCAL_CFLAGS += -DTW_INCLUDE_CRYPTO
+    LOCAL_CFLAGS += -DTW_INCLUDE_L_CRYPTO
+    LOCAL_SHARED_LIBRARIES += libcryptfslollipop
+endif
 ifeq ($(TW_USE_MODEL_HARDWARE_ID_FOR_DEVICE_ID), true)
     LOCAL_CFLAGS += -DTW_USE_MODEL_HARDWARE_ID_FOR_DEVICE_ID
 endif
@@ -527,6 +532,9 @@
     include $(commands_recovery_local_path)/crypto/scrypt/Android.mk
     include $(commands_recovery_local_path)/crypto/crypttools/Android.mk
 endif
+ifeq ($(TW_INCLUDE_L_CRYPTO), true)
+    include $(commands_recovery_local_path)/crypto/lollipop/Android.mk
+endif
 ifeq ($(TWHAVE_SELINUX), true)
     include $(commands_recovery_local_path)/minzip/Android.mk
 else