diff --git a/CMakeLists.txt b/CMakeLists.txt
index 509831913a..85f6b4c2bc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2363,7 +2363,7 @@ endif()
 
 include_directories(ext/libchdr/include)
 
-target_link_libraries(${CoreLibName} Common native chdr kirk cityhash sfmt19937 xbrz xxhash rcheevos minimp3 ${GlslangLibs}
+target_link_libraries(${CoreLibName} Common native chdr kirk cityhash sfmt19937 xbrz xxhash rcheevos minimp3 at3_standalone ${GlslangLibs}
 	${CoreExtraLibs} ${OPENGL_LIBRARIES} ${X11_LIBRARIES} ${CMAKE_DL_LIBS})
 
 if(NOT HTTPS_NOT_AVAILABLE)
diff --git a/android/jni/Android.mk b/android/jni/Android.mk
index 202a40dbcc..87ffa7fa5c 100644
--- a/android/jni/Android.mk
+++ b/android/jni/Android.mk
@@ -112,6 +112,22 @@ NAETT_FILES := \
 MINIMP3_FILES := \
     ${SRC}/ext/minimp3/minimp3.cpp
 
+AT3_STANDALONE_FILES := \
+	${SRC}/ext/at3_standalone/atrac.cpp \
+	${SRC}/ext/at3_standalone/atrac3.cpp \
+	${SRC}/ext/at3_standalone/atrac3plus.cpp \
+	${SRC}/ext/at3_standalone/atrac3plusdec.cpp \
+	${SRC}/ext/at3_standalone/atrac3plusdsp.cpp \
+	${SRC}/ext/at3_standalone/avcodec.cpp \
+	${SRC}/ext/at3_standalone/get_bits.cpp \
+	${SRC}/ext/at3_standalone/channel_layout.cpp \
+	${SRC}/ext/at3_standalone/compat.cpp \
+	${SRC}/ext/at3_standalone/fft.cpp \
+	${SRC}/ext/at3_standalone/float_dsp.cpp \
+	${SRC}/ext/at3_standalone/mathematics.cpp \
+	${SRC}/ext/at3_standalone/mem.cpp \
+	${SRC}/ext/at3_standalone/sinewin.cpp
+
 RCHEEVOS_FILES := \
   ${SRC}/ext/rcheevos/src/rapi/rc_api_common.c \
   ${SRC}/ext/rcheevos/src/rapi/rc_api_editor.c \
@@ -221,6 +237,7 @@ EXEC_AND_LIB_FILES := \
   $(RCHEEVOS_FILES) \
   $(NAETT_FILES) \
   $(MINIMP3_FILES) \
+  $(AT3_STANDALONE_FILES) \
   $(EXT_FILES) \
   $(NATIVE_FILES) \
   $(SRC)/Common/Buffer.cpp \
diff --git a/ext/CMakeLists.txt b/ext/CMakeLists.txt
index dbd8417791..b0aa7adb2b 100644
--- a/ext/CMakeLists.txt
+++ b/ext/CMakeLists.txt
@@ -29,6 +29,7 @@ set(ENABLE_GLSLANG_INSTALL OFF)
 add_subdirectory(glslang EXCLUDE_FROM_ALL)
 add_subdirectory(snappy)
 add_subdirectory(minimp3)
+add_subdirectory(at3_standalone)
 add_subdirectory(udis86)
 add_subdirectory(SPIRV-Cross-build)
 add_subdirectory(rcheevos-build)
diff --git a/ext/at3_standalone/CMakeLists.txt b/ext/at3_standalone/CMakeLists.txt
new file mode 100644
index 0000000000..d62845caed
--- /dev/null
+++ b/ext/at3_standalone/CMakeLists.txt
@@ -0,0 +1,25 @@
+cmake_minimum_required (VERSION 3.2.0)
+project (at3_standalone)
+
+set(SRC_DIR .)
+
+# format
+set(ALL_SOURCE_FILES
+	# rapi
+	${SRC_DIR}/atrac.cpp
+	${SRC_DIR}/atrac3.cpp
+	${SRC_DIR}/atrac3plus.cpp
+	${SRC_DIR}/atrac3plusdec.cpp
+	${SRC_DIR}/atrac3plusdsp.cpp
+	${SRC_DIR}/avcodec.cpp
+	${SRC_DIR}/get_bits.cpp
+	${SRC_DIR}/channel_layout.cpp
+	${SRC_DIR}/compat.cpp
+	${SRC_DIR}/fft.cpp
+	${SRC_DIR}/float_dsp.cpp
+	${SRC_DIR}/mathematics.cpp
+	${SRC_DIR}/mem.cpp
+	${SRC_DIR}/sinewin.cpp
+	)
+
+add_library(at3_standalone STATIC ${ALL_SOURCE_FILES})