diff --git a/plugins/channelrx/remotesink/CMakeLists.txt b/plugins/channelrx/remotesink/CMakeLists.txt
index 0f6db4a7e..32a1d51bd 100644
--- a/plugins/channelrx/remotesink/CMakeLists.txt
+++ b/plugins/channelrx/remotesink/CMakeLists.txt
@@ -1,5 +1,10 @@
 project(remotesink)
 
+if (ARCHITECTURE_ARM64)
+    message(STATUS "Compiling RemoteSink for ARM64 with USE_NEON definition")
+    add_compile_definitions(USE_NEON)
+endif()
+
 set(remotesink_SOURCES
     remotesink.cpp
     remotesinkbaseband.cpp
diff --git a/plugins/channeltx/remotesource/CMakeLists.txt b/plugins/channeltx/remotesource/CMakeLists.txt
index d179cc4fc..141f49415 100644
--- a/plugins/channeltx/remotesource/CMakeLists.txt
+++ b/plugins/channeltx/remotesource/CMakeLists.txt
@@ -1,5 +1,10 @@
 project(remotesource)
 
+if (ARCHITECTURE_ARM64)
+    message(STATUS "Compiling RemoteSource for ARM64 with USE_NEON definition")
+    add_compile_definitions(USE_NEON)
+endif()
+
 set(remotesource_SOURCES
     remotesource.cpp
     remotesourcebaseband.cpp
@@ -31,7 +36,6 @@ if(NOT SERVER_MODE)
     set(remotesource_SOURCES
         ${remotesource_SOURCES}
         remotesourcegui.cpp
-
         remotesourcegui.ui
     )
     set(remotesource_HEADERS
@@ -59,13 +63,13 @@ if(CM256CC_EXTERNAL)
 endif()
 
 target_link_libraries(${TARGET_NAME}
-        Qt5::Core
-        ${TARGET_LIB}
-        Qt5::Network
+    Qt5::Core
+    ${TARGET_LIB}
+    Qt5::Network
 	sdrbase
 	${TARGET_LIB_GUI}
-        swagger
-        ${CM256CC_LIBRARIES}
+    swagger
+    ${CM256CC_LIBRARIES}
 )
 
 install(TARGETS ${TARGET_NAME} DESTINATION ${INSTALL_FOLDER})
diff --git a/plugins/samplesink/remoteoutput/CMakeLists.txt b/plugins/samplesink/remoteoutput/CMakeLists.txt
index 6e665d909..14f5aee09 100644
--- a/plugins/samplesink/remoteoutput/CMakeLists.txt
+++ b/plugins/samplesink/remoteoutput/CMakeLists.txt
@@ -1,5 +1,10 @@
 project(remoteoutput)
 
+if (ARCHITECTURE_ARM64)
+    message(STATUS "Compiling RemoteOutput for ARM64 with USE_NEON definition")
+    add_compile_definitions(USE_NEON)
+endif()
+
 set(remoteoutput_SOURCES
 	remoteoutput.cpp
 	remoteoutputplugin.cpp
diff --git a/plugins/samplesource/remoteinput/CMakeLists.txt b/plugins/samplesource/remoteinput/CMakeLists.txt
index ef8f144f2..264a74743 100644
--- a/plugins/samplesource/remoteinput/CMakeLists.txt
+++ b/plugins/samplesource/remoteinput/CMakeLists.txt
@@ -1,5 +1,10 @@
 project(remoteinput)
 
+if (ARCHITECTURE_ARM64)
+    message(STATUS "Compiling RemoteInput for ARM64 with USE_NEON definition")
+    add_compile_definitions(USE_NEON)
+endif()
+
 set(remoteinput_SOURCES
     remoteinputbuffer.cpp
     remoteinputudphandler.cpp
@@ -28,7 +33,6 @@ if(NOT SERVER_MODE)
     set(remoteinput_SOURCES
         ${remoteinput_SOURCES}
         remoteinputgui.cpp
-
         remoteinputgui.ui
     )
     set(remoteinput_HEADERS
@@ -56,12 +60,12 @@ if(CM256CC_EXTERNAL)
 endif()
 
 target_link_libraries(${TARGET_NAME}
-        Qt5::Core
-        ${TARGET_LIB}
+    Qt5::Core
+    ${TARGET_LIB}
 	sdrbase
 	${TARGET_LIB_GUI}
-        swagger
-        ${CM256CC_LIBRARIES}
+    swagger
+    ${CM256CC_LIBRARIES}
 )
 
 install(TARGETS ${TARGET_NAME} DESTINATION ${INSTALL_FOLDER})