diff --git a/client/Android/FreeRDPCore/jni/CMakeLists.txt b/client/Android/FreeRDPCore/jni/CMakeLists.txt
index 5fa6ec505..305c4d1ad 100644
--- a/client/Android/FreeRDPCore/jni/CMakeLists.txt
+++ b/client/Android/FreeRDPCore/jni/CMakeLists.txt
@@ -19,10 +19,14 @@
 set(MODULE_NAME "freerdp-android")
 set(MODULE_PREFIX "FREERDP_CLIENT_ANDROID")
 
-
 include_directories(.)
 include_directories(generated)
 
+CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/Application.mk.cmake
+	${CMAKE_CURRENT_BINARY_DIR}/Application.mk @ONLY)
+CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/Android.mk.cmake
+	${CMAKE_CURRENT_BINARY_DIR}/Android.mk @ONLY)
+
 if(CMAKE_COMPILER_IS_GNUCC)
 	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-pointer-sign")
 endif()
@@ -68,16 +72,15 @@ set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} jnigraphics)
 
 target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS})
 
+file(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/${ANDROID_ABI}")
 set_target_properties(${MODULE_NAME}
-	PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${ANDROID_BINARY_DIR}/libs/${ANDROID_ABI}")
+	PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/${ANDROID_ABI}")
 
 set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "Client/Android")
 
 get_property(LIB_ABSNAME TARGET ${MODULE_NAME} PROPERTY LOCATION)
-file(MAKE_DIRECTORY ${ANDROID_BINARY_DIR}/obj/local/${ANDROID_NDK_ABI_NAME})
 
 add_custom_command(TARGET ${MODULE_NAME} POST_BUILD
-	COMMAND ${CMAKE_COMMAND} -E copy ${LIB_ABSNAME}
-		${ANDROID_BINARY_DIR}/obj/local/${ANDROID_NDK_ABI_NAME}/)
-
+	COMMAND ${NDK_COMMAND} NDK_DEBUG=${NDK_DEBUG}
+	WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/../)