diff --git a/BUILD.md b/BUILD.md
index 8a6b265..337fd7a 100644
--- a/BUILD.md
+++ b/BUILD.md
@@ -85,7 +85,7 @@ Enable RW filesystem if you are using Pi-Star:
 Install the necessary software tools:
 
     sudo apt-get update
-    sudo apt-get install gcc-arm-none-eabi gdb-arm-none-eabi libstdc++-arm-none-eabi-newlib libnewlib-arm-none-eabi
+    sudo apt-get install gcc-arm-none-eabi gdb-multiarch libstdc++-arm-none-eabi-newlib libnewlib-arm-none-eabi
     
     cd ~
     git clone https://git.code.sf.net/p/stm32flash/code stm32flash
@@ -276,7 +276,7 @@ Enable RW filesystem if you are using Pi-Star:
 Install the necessary software tools:
 
     sudo apt-get update
-    sudo apt-get install gcc-arm-none-eabi gdb-arm-none-eabi libstdc++-arm-none-eabi-newlib libnewlib-arm-none-eabi
+    sudo apt-get install gcc-arm-none-eabi gdb-multiarch libstdc++-arm-none-eabi-newlib libnewlib-arm-none-eabi
 
 Download the sources:
 
@@ -411,7 +411,7 @@ Enable RW filesystem if you are using Pi-Star:
 Install the necessary software tools:
 
     sudo apt-get update
-    sudo apt-get install gcc-arm-none-eabi gdb-arm-none-eabi libstdc++-arm-none-eabi-newlib libnewlib-arm-none-eabi
+    sudo apt-get install gcc-arm-none-eabi gdb-multiarch libstdc++-arm-none-eabi-newlib libnewlib-arm-none-eabi
 
 Download the sources:
 
diff --git a/Makefile b/Makefile
index c73834e..f5744a8 100644
--- a/Makefile
+++ b/Makefile
@@ -125,6 +125,11 @@ else
 				ST_FLASH_OPTS= 
 		  endif
 			STM32FLASH=./$(F1_LIB_PATH)/utils/linux64/stm32flash
+		else ifeq ($(shell uname -m),aarch64)
+            DFU_RST=./$(F1_LIB_PATH)/utils/rpi32/upload-reset
+            DFU_UTIL=./$(F1_LIB_PATH)/utils/rpi32/dfu-util
+            ST_FLASH=./$(F1_LIB_PATH)/utils/rpi32/st-flash
+            STM32FLASH=./$(F1_LIB_PATH)/utils/rpi32/stm32flash
 		else ifeq ($(shell uname -m),armv7l)
 			DFU_RST=./$(F1_LIB_PATH)/utils/rpi32/upload-reset
 			DFU_UTIL=./$(F1_LIB_PATH)/utils/rpi32/dfu-util