diff --git a/Makefile b/Makefile
index 40caa6e..c730908 100644
--- a/Makefile
+++ b/Makefile
@@ -26,9 +26,8 @@ all: toolchain-all
 
 crosstool-ng := $(LOCAL_DIR)/bin/ct-ng
 $(crosstool-ng):
-	# FIXME Use development version until fix for hanging build is merged to crosstool-ng repository.
-	git clone https://github.com/cpackham/crosstool-ng.git
-	cd crosstool-ng && git checkout a7835a0251e5acdb38d7cbf301457058266bcbca
+	git clone https://github.com/crosstool-ng/crosstool-ng.git
+	cd crosstool-ng && git checkout e63c40854c977f488bee159a8f8ebf5fc06c8666
 	cd crosstool-ng && ./bootstrap
 	cd crosstool-ng && ./configure --prefix="$(LOCAL_DIR)"
 	cd crosstool-ng && make -j $(JOBS)
@@ -125,7 +124,7 @@ toolchain-all: toolchain-lin toolchain-win toolchain-mac rack-sdk-all
 
 
 toolchain-clean:
-	rm -rf .build local osxcross $(rack-sdk-mac-x64) $(rack-sdk-win-x64) $(rack-sdk-lin-x64)
+	rm -rf .build local osxcross $(rack-sdk-mac-x64) $(rack-sdk-win-x64) $(rack-sdk-lin-x64) $(rack-sdk-mac-arm64)
 
 
 # Plugin build