diff --git a/prepare.py b/prepare.py
index 043956bf3..e299f31ea 100755
--- a/prepare.py
+++ b/prepare.py
@@ -65,6 +65,12 @@ class AndroidArmv7Target(AndroidTarget):
         AndroidTarget.__init__(self, 'armv7')
 
 
+class AndroidArm64Target(AndroidTarget):
+
+    def __init__(self):
+        AndroidTarget.__init__(self, 'arm64')
+
+
 class AndroidX86Target(AndroidTarget):
 
     def __init__(self):
@@ -76,6 +82,7 @@ class AndroidX86Target(AndroidTarget):
 android_targets = {
     'arm': AndroidArmTarget(),
     'armv7': AndroidArmv7Target(),
+    'arm64': AndroidArm64Target(),
     'x86': AndroidX86Target()
 }
 
@@ -251,6 +258,25 @@ copy-libs:
 \t\tcp -f liblinphone-sdk/android-armv7/bin/gdbserver libs/armeabi-v7a && \\
 \t\tcp -f liblinphone-sdk/android-armv7/bin/gdb.setup libs/armeabi-v7a; \\
 \tfi
+\trm -rf libs-debug/arm64-v8a
+\trm -rf libs/arm64-v8a
+\tif test -d "liblinphone-sdk/android-arm64"; then \\
+\t\tmkdir -p libs-debug/arm64-v8a && \\
+\t\tcp -f liblinphone-sdk/android-arm64/lib/libgnustl_shared.so libs-debug/arm64-v8a && \\
+\t\tcp -f liblinphone-sdk/android-arm64/lib/lib*-arm64-v8a.so libs-debug/arm64-v8a && \\
+\t\tcp -f liblinphone-sdk/android-arm64/lib/mediastreamer/plugins/*.so libs-debug/arm64-v8a && \\
+\t\tmkdir -p libs/arm64-v8a && \\
+\t\tcp -f liblinphone-sdk/android-arm64/lib/libgnustl_shared.so libs/arm64-v8a && \\
+\t\tcp -f liblinphone-sdk/android-arm64/lib/lib*-arm64-v8a.so libs/arm64-v8a && \\
+\t\tcp -f liblinphone-sdk/android-arm64/lib/mediastreamer/plugins/*.so libs/arm64-v8a && \\
+\t\tsh WORK/android-arm64/strip.sh libs/arm64-v8a/*.so; \\
+\tfi
+\tif test -f "liblinphone-sdk/android-arm64/bin/gdbserver"; then \\
+\t\tcp -f liblinphone-sdk/android-arm64/bin/gdbserver libs-debug/arm64-v8a && \\
+\t\tcp -f liblinphone-sdk/android-arm64/bin/gdb.setup libs-debug/arm64-v8a && \\
+\t\tcp -f liblinphone-sdk/android-arm64/bin/gdbserver libs/arm64-v8a && \\
+\t\tcp -f liblinphone-sdk/android-arm64/bin/gdb.setup libs/arm64-v8a; \\
+\tfi
 \trm -rf libs-debug/x86
 \trm -rf libs/x86
 \tif test -d "liblinphone-sdk/android-x86"; then \\
diff --git a/submodules/externals/build/ffmpeg/CMakeLists.txt b/submodules/externals/build/ffmpeg/CMakeLists.txt
index 4ac9e2ac2..db7714a35 100644
--- a/submodules/externals/build/ffmpeg/CMakeLists.txt
+++ b/submodules/externals/build/ffmpeg/CMakeLists.txt
@@ -31,11 +31,11 @@ find_library(AVUTIL_LIBRARY avutil)
 find_library(SWRESAMPLE_LIBRARY swresample)
 find_library(SWSCALE_LIBRARY swscale)
 
-add_library(ffmpeg-linphone-${CMAKE_SYSTEM_PROCESSOR} SHARED)
-target_link_libraries(ffmpeg-linphone-${CMAKE_SYSTEM_PROCESSOR} LINK_PRIVATE "m" "-Wl,-whole-archive" ${AVCODEC_LIBRARY} ${AVUTIL_LIBRARY} ${SWRESAMPLE_LIBRARY} ${SWSCALE_LIBRARY} "-Wl,-no-whole-archive")
-set_target_properties(ffmpeg-linphone-${CMAKE_SYSTEM_PROCESSOR} PROPERTIES LINKER_LANGUAGE C)
+add_library(ffmpeg-linphone-${NDK_ARCHITECTURE} SHARED)
+target_link_libraries(ffmpeg-linphone-${NDK_ARCHITECTURE} LINK_PRIVATE "m" "-Wl,-whole-archive" ${AVCODEC_LIBRARY} ${AVUTIL_LIBRARY} ${SWRESAMPLE_LIBRARY} ${SWSCALE_LIBRARY} "-Wl,-no-whole-archive")
+set_target_properties(ffmpeg-linphone-${NDK_ARCHITECTURE} PROPERTIES LINKER_LANGUAGE C)
 
-install(TARGETS ffmpeg-linphone-${CMAKE_SYSTEM_PROCESSOR}
+install(TARGETS ffmpeg-linphone-${NDK_ARCHITECTURE}
 	RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
 	LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
 	ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}