diff --git a/Android.mk b/Android.mk
index 0cd36d7..c9f471d 100644
--- a/Android.mk
+++ b/Android.mk
@@ -1,5 +1,9 @@
 LOCAL_PATH := $(call my-dir)
 
+# Enable to be able to use ALOG* with #include "cutils/log.h"
+#log_c_includes += system/core/include
+#log_shared_libraries := liblog
+
 # These makefiles are here instead of being Android.mk files in the
 # respective crypto, ssl, and apps directories so
 # that import_openssl.sh import won't remove them.
diff --git a/Crypto.mk b/Crypto.mk
index 622c8fb..ccbf97a 100644
--- a/Crypto.mk
+++ b/Crypto.mk
@@ -535,11 +535,15 @@
 
 local_as_flags := -x assembler-with-cpp
 
+local_c_includes += $(log_c_includes)
+
 #######################################
 # target static library
 include $(CLEAR_VARS)
 include $(LOCAL_PATH)/android-config.mk
 
+LOCAL_SHARED_LIBRARIES := $(log_shared_libraries)
+
 ifeq ($(TARGET_ARCH),arm)
 LOCAL_NDK_VERSION := 5
 LOCAL_SDK_VERSION := 9
@@ -573,6 +577,8 @@
 include $(CLEAR_VARS)
 include $(LOCAL_PATH)/android-config.mk
 
+LOCAL_SHARED_LIBRARIES := $(log_shared_libraries)
+
 ifeq ($(TARGET_ARCH),arm)
 LOCAL_NDK_VERSION := 5
 LOCAL_SDK_VERSION := 9
@@ -609,6 +615,7 @@
 # host shared library
 include $(CLEAR_VARS)
 include $(LOCAL_PATH)/android-config.mk
+LOCAL_SHARED_LIBRARIES := $(log_shared_libraries)
 LOCAL_SRC_FILES += $(local_src_files)
 LOCAL_CFLAGS += $(local_c_flags) -DPURIFY
 LOCAL_ASFLAGS += $(local_as_flags)
@@ -625,6 +632,7 @@
 
 include $(CLEAR_VARS)
 include $(LOCAL_PATH)/android-config.mk
+LOCAL_SHARED_LIBRARIES := $(log_shared_libraries)
 LOCAL_SRC_FILES += $(local_src_files)
 LOCAL_CFLAGS += $(local_c_flags) -DPURIFY
 LOCAL_ASFLAGS += $(local_as_flags)
diff --git a/Ssl.mk b/Ssl.mk
index c839a29..32107ee 100644
--- a/Ssl.mk
+++ b/Ssl.mk
@@ -48,6 +48,8 @@
 	ssl/t1_srvr.c \
 	ssl/tls_srp.c
 
+local_c_includes += $(log_c_includes)
+
 #######################################
 # target static library
 include $(CLEAR_VARS)
@@ -59,6 +61,7 @@
 endif
 LOCAL_SRC_FILES += $(local_src_files)
 LOCAL_C_INCLUDES += $(local_c_includes)
+LOCAL_SHARED_LIBRARIES = $(log_shared_libraries)
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE:= libssl_static
 include $(BUILD_STATIC_LIBRARY)
@@ -74,7 +77,7 @@
 endif
 LOCAL_SRC_FILES += $(local_src_files)
 LOCAL_C_INCLUDES += $(local_c_includes)
-LOCAL_SHARED_LIBRARIES += libcrypto
+LOCAL_SHARED_LIBRARIES += libcrypto $(log_shared_libraries)
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE:= libssl
 include $(BUILD_SHARED_LIBRARY)
@@ -85,7 +88,7 @@
 include $(LOCAL_PATH)/android-config.mk
 LOCAL_SRC_FILES += $(local_src_files)
 LOCAL_C_INCLUDES += $(local_c_includes)
-LOCAL_SHARED_LIBRARIES += libcrypto
+LOCAL_SHARED_LIBRARIES += libcrypto $(log_shared_libraries)
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE:= libssl
 include $(BUILD_HOST_SHARED_LIBRARY)
@@ -96,7 +99,7 @@
 include $(LOCAL_PATH)/android-config.mk
 LOCAL_SRC_FILES:= ssl/ssltest.c
 LOCAL_C_INCLUDES += $(local_c_includes)
-LOCAL_SHARED_LIBRARIES := libssl libcrypto
+LOCAL_SHARED_LIBRARIES := libssl libcrypto $(log_shared_libraries)
 LOCAL_MODULE:= ssltest
 LOCAL_MODULE_TAGS := optional
 include $(BUILD_EXECUTABLE)
diff --git a/android-config.mk b/android-config.mk
index 2198ef6..c751fd7 100644
--- a/android-config.mk
+++ b/android-config.mk
@@ -11,7 +11,7 @@
 LOCAL_CFLAGS += -DOPENSSL_NO_CAMELLIA -DOPENSSL_NO_CAPIENG -DOPENSSL_NO_CAST -DOPENSSL_NO_CMS -DOPENSSL_NO_GMP -DOPENSSL_NO_IDEA -DOPENSSL_NO_JPAKE -DOPENSSL_NO_MD2 -DOPENSSL_NO_MDC2 -DOPENSSL_NO_RC5 -DOPENSSL_NO_SHA0 -DOPENSSL_NO_RFC3779 -DOPENSSL_NO_SEED -DOPENSSL_NO_STORE -DOPENSSL_NO_WHIRLPOOL
 
 # Extra
-LOCAL_CFLAGS += -DOPENSSL_NO_STATIC_ENGINE -DOPENSSL_NO_GOST -DZLIB -DOPENSSL_NO_DTLS1 -DOPENSSL_NO_RSAX -DOPENSSL_NO_RDRAND -DOPENSSL_NO_SCTP
+LOCAL_CFLAGS += -DOPENSSL_NO_STATIC_ENGINE -DOPENSSL_NO_GOST -DZLIB -DOPENSSL_NO_DTLS1 -DOPENSSL_NO_RSAX -DOPENSSL_NO_RDRAND -DOPENSSL_NO_SCTP -DOPENSSL_NO_HEARTBEATS
 
 # Directories
 LOCAL_CFLAGS += -DOPENSSLDIR="\"/system/lib/ssl\"" -DENGINESDIR="\"/system/lib/ssl/engines\""