diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7087fb054..abff46f68 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -217,8 +217,9 @@ if(BUILD_PERF)
 endif()
 
 if(3DS)
-	add_executable(${BINARY_NAME}-elf ${CMAKE_SOURCE_DIR}/src/platform/3ds/main.c)
-	target_link_libraries(${BINARY_NAME}-elf ${BINARY_NAME} m ${OS_LIB})
+	add_executable(${BINARY_NAME}.elf ${CMAKE_SOURCE_DIR}/src/platform/3ds/main.c)
+	target_link_libraries(${BINARY_NAME}.elf ${BINARY_NAME} m ${OS_LIB})
+	add_custom_command(TARGET ${BINARY_NAME}.elf POST_BUILD COMMAND ${3DSXTOOL} ${BINARY_NAME}.elf ${BINARY_NAME}.3dsx)
 endif()
 
 # Packaging
diff --git a/src/platform/3ds/CMakeToolchain.txt b/src/platform/3ds/CMakeToolchain.txt
index b16b1a830..2bc30f733 100644
--- a/src/platform/3ds/CMakeToolchain.txt
+++ b/src/platform/3ds/CMakeToolchain.txt
@@ -33,5 +33,7 @@ set(CMAKE_EXE_LINKER_FLAGS ${link_flags} CACHE INTERNAL "exe link flags")
 set(CMAKE_MODULE_LINKER_FLAGS ${link_flags} CACHE INTERNAL "module link flags")
 set(CMAKE_SHARED_LINKER_FLAGS ${link_flags} CACHE INTERNAL "shared link flags")
 
+set(3DSXTOOL ${toolchain_bin_dir}/3dsxtool)
+
 set(3DS ON)
 add_definitions(-D_3DS -DARM11)