diff --git a/CMakeLists.txt b/CMakeLists.txt
index f9ce8252f..aaa55aa6e 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -268,6 +268,9 @@ endif()
 
 # Android
 if(ANDROID)
+	if("${CMAKE_BUILD_TYPE}" STREQUAL "Debug")
+		add_definitions(-DNDK_DEBUG=1)
+	endif()
 	if (NOT FREERDP_ANDROID_EXTERNAL_SSL_PATH)
 		if(IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/external/openssl")
 			set(FREERDP_ANDROID_EXTERNAL_SSL_PATH "${CMAKE_CURRENT_SOURCE_DIR}/external/openssl")
@@ -277,7 +280,8 @@ if(ANDROID)
 	endif()
 	set(CMAKE_FIND_ROOT_PATH ${CMAKE_FIND_ROOT_PATH} ${FREERDP_ANDROID_EXTERNAL_SSL_PATH})
 	set(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/client/Android/FreeRDPCore/libs/${ANDROID_ABI})
-	CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/scripts/regenerate_jni_headers.sh.cmake ${CMAKE_CURRENT_SOURCE_DIR}/scripts/regenerate_jni_headers.sh @ONLY)
+	CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/scripts/regenerate_jni_headers.sh.cmake
+		${CMAKE_CURRENT_SOURCE_DIR}/scripts/regenerate_jni_headers.sh @ONLY)
 endif()
 
 set(CMAKE_THREAD_PREFER_PTHREAD TRUE)
@@ -310,6 +314,10 @@ set(OPENSSL_FEATURE_TYPE "REQUIRED")
 set(OPENSSL_FEATURE_PURPOSE "cryptography")
 set(OPENSSL_FEATURE_DESCRIPTION "encryption, certificate validation, hashing functions")
 
+set(OPENSLES_FEATURE_TYPE "OPTIONAL")
+set(OPENSLES_FEATURE_PURPOSE "multimedia")
+set(OPENSLES_FEATURE_DESCRIPTION "OpenSLES audio / video")
+
 set(ALSA_FEATURE_TYPE "RECOMMENDED")
 set(ALSA_FEATURE_PURPOSE "sound")
 set(ALSA_FEATURE_DESCRIPTION "audio input, audio output and multimedia redirection")
@@ -356,6 +364,7 @@ if(WIN32)
 	set(PCSC_FEATURE_TYPE "DISABLED")
 	set(FFMPEG_FEATURE_TYPE "DISABLED")
 	set(GSTREAMER_FEATURE_TYPE "DISABLED")
+	set(OPENSLES_FEATURE_TYPE "DISABLED")
 endif()
 
 if(APPLE)
@@ -371,6 +380,7 @@ if(APPLE)
 		set(PCSC_FEATURE_TYPE "DISABLED")
 		set(GSTREAMER_FEATURE_TYPE "DISABLED")
 	endif()
+	set(OPENSLES_FEATURE_TYPE "DISABLED")
 endif()
 
 if(ANDROID)
@@ -382,6 +392,7 @@ if(ANDROID)
 	set(PCSC_FEATURE_TYPE "DISABLED")
 	set(FFMPEG_FEATURE_TYPE "DISABLED")
 	set(GSTREAMER_FEATURE_TYPE "DISABLED")
+	set(OPENSLES_FEATURE_TYPE "REQUIRED")
 endif()
 
 
@@ -395,6 +406,7 @@ endif()
 
 find_feature(ZLIB ${ZLIB_FEATURE_TYPE} ${ZLIB_FEATURE_PURPOSE} ${ZLIB_FEATURE_DESCRIPTION})
 find_feature(OpenSSL ${OPENSSL_FEATURE_TYPE} ${OPENSSL_FEATURE_PURPOSE} ${OPENSSL_FEATURE_DESCRIPTION})
+find_feature(OpenSLES ${OPENSLES_FEATURE_TYPE} ${OPENSLES_FEATURE_PURPOSE} ${OPENSLES_FEATURE_DESCRIPTION})
 
 find_feature(ALSA ${ALSA_FEATURE_TYPE} ${ALSA_FEATURE_PURPOSE} ${ALSA_FEATURE_DESCRIPTION})
 find_feature(Pulse ${PULSE_FEATURE_TYPE} ${PULSE_FEATURE_PURPOSE} ${PULSE_FEATURE_DESCRIPTION})
diff --git a/client/Android/CMakeLists.txt b/client/Android/CMakeLists.txt
index 9557f7e63..0fd51b1a5 100644
--- a/client/Android/CMakeLists.txt
+++ b/client/Android/CMakeLists.txt
@@ -36,5 +36,11 @@ if(ANDROID_BUILD_JAVA)
 	endif()
 endif(ANDROID_BUILD_JAVA)
 
+if("${CMAKE_BUILD_TYPE}" STREQUAL "Debug")
+	set(ANDROID_DEBUG_ENABLE "true")
+else()
+	set(ANDROID_DEBUG_ENABLE "false")
+endif()
+
 add_subdirectory(FreeRDPCore)
 add_subdirectory(aFreeRDP)